Bump version to 0.14.2-alpha1

Cleanup unsed imports
Add docs
2024-01-14 16:19:54 -06:00 · 2024-01-14 16:18:47 -06:00 · 2024-01-14 16:18:19 -06:00 · 2024-01-14 15:05:52 -06:00 · 2024-01-14 14:49:15 -06:00 · 2024-01-12 23:58:55 -06:00
158 changed files with 3911 additions and 7183 deletions
@@ -4,7 +4,7 @@ runs:
  using: composite
  steps:
    - name: Setup PNPM
-      uses: pnpm/action-setup@v3
+      uses: pnpm/action-setup@v2
      with:
        version: 8
    - name: Setup NodeJS
@@ -9,7 +9,3 @@ updates:
    directory: '/' # Location of package manifests
    schedule:
      interval: 'monthly'
-  - package-ecosystem: 'github-actions'
-    directory: '/'
-    schedule:
-      interval: 'monthly'
@@ -14,7 +14,7 @@ jobs:
  publish:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
      - uses: docker/login-action@v3
        with:
@@ -5,14 +5,13 @@ on:
 jobs:
  validate:
    uses: './.github/workflows/validate.yml'
-    secrets: inherit

  publish:
    runs-on: ubuntu-22.04
    needs:
      - validate
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          fetch-depth: 0

@@ -11,8 +11,8 @@ jobs:
  sync:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v3
+      - uses: actions/checkout@v3
+      - uses: pnpm/action-setup@v2
        with:
          version: 8
      - uses: actions/setup-node@v4
@@ -10,30 +10,30 @@ jobs:
  formatting:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
      - run: pnpm format:check
  lint:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
      - run: pnpm lint
  type-check:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
      - run: pnpm compile
  validate-demo:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
-      - run: pnpm tsc --noEmit
-        working-directory: demo
      - run: pnpm build:all
        working-directory: demo
+      - run: pnpm tsc --noEmit
+        working-directory: demo
      - run: pnpm wxt zip
        working-directory: demo
      - run: pnpm vitest run
@@ -41,17 +41,17 @@ jobs:
  tests:
    runs-on: ubuntu-22.04
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
      - name: pnpm test:coverage
        run: pnpm test:coverage --reporter=default --reporter=hanging-process
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v3
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
  windows-tests:
    runs-on: windows-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
      - run: pnpm test run
  template:
@@ -65,7 +65,7 @@ jobs:
          - vanilla
          - vue
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: ./.github/actions/setup
      - run: pnpm pack
      - run: npm i
@@ -1,550 +1,5 @@
 # Changelog

-## v0.17.1
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.17.0...v0.17.1)
-
-### 🩹 Fixes
-
- Content scripts not loading in dev mode ([3fbbe2c](https://github.com/wxt-dev/wxt/commit/3fbbe2c))
-
-### 📖 Documentation
-
- Lots of small typo fixes ([#480](https://github.com/wxt-dev/wxt/pull/480))
-
-### ❤️ Contributors
-
- Leo Shklovskii <leo@thermopylae.net>
-
-## v0.17.0
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.11...v0.17.0)
-
-### 🚀 Enhancements
-
- **storage:** ⚠️  Improved support for default values on storage items ([#477](https://github.com/wxt-dev/wxt/pull/477))
-
-### 🩹 Fixes
-
- **storage:** ⚠️  Only run migrations when the extension is updated ([#478](https://github.com/wxt-dev/wxt/pull/478))
- Improve dev mode for content scripts registered at runtime ([#474](https://github.com/wxt-dev/wxt/pull/474))
-
-### 📖 Documentation
-
- **storage:** Update docs ([91fc41c](https://github.com/wxt-dev/wxt/commit/91fc41c))
-
-#### ⚠️ Breaking Changes
-
-`v0.17.0` introduces several breaking changes to `wxt/storage`.
-
-First, if you were using `defineItem` with versioning and no default value, you will need to add `defaultValue: null` to the options and update the first type parameter:
-
-```ts
-// < 0.17
-const item = storage.defineItem<number>("local:count", {
-  version: ...,
-  migrations: ...,
-})
-
-// >= 0.17
-const item = storage.defineItem<number | null>("local:count", {
-  defaultValue: null,
-  version: ...,
-  migrations: ...,
-})
-```
-
-The `defaultValue` property is now required if passing in the second options argument. 
-
-If you exclude the second options argument, it will default to being nullable, as before.
-
-```ts
-const item: WxtStorageItem<number | null> = storage.defineItem<number>("local:count");
-const value: number | null = await item.getValue();
-```
-
-> If you don't use typescript, there aren't any breaking changes, this is just a type change.
-
-For storage items that are not nullable, the `watch` callback types has improved and will use the default value instead of `null` when the value is missing:
-
-```ts
-// >=0.17
-const item = storage.defineItem<number>("local:count", { defaultValue: 0 });
-item.watch((newValue: number | null, oldValue: number | null) => {
-  // ...
-});
-
-// >=0.17
-const item = storage.defineItem<number>("local:count", { defaultValue: 0 });
-item.watch((newValue: number, oldValue: number) => {
-  // ...
-});
-```
-
-You can also access the default value directly off the item:
-
-```ts
-console.log(item.defaultValue); // 0
-```
-
-The second breaking change is that migrations for versioned items only run when the extension is updated. Before, they were ran whenever the storage item was created, in any entrypoint (background, popup, content script, etc). Now, in v0.17, storage items will only run migrations when the `browser.runtime.onInstalled` event is fired with `reason = "update"` in the background. See the updated docs to make sure they run correctly: https://wxt.dev/guide/storage.html#running-migrations. TLDR: you need to import all storage items into the background entrypoint for the `onInstalled` hook to fire properly and thus run the migrations.
-
-To keep the old behavior, call the new `migrate` function to run migrations as soon as an item is defined:
-
-```ts
-const item = storage.defineItem(...);
-item.migrate();
-```
-
-## v0.16.11
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.10...v0.16.11)
-
-### 🩹 Fixes
-
- Output main JS file for HTML entrypoints to chunks directory ([#473](https://github.com/wxt-dev/wxt/pull/473))
-
-### 🏡 Chore
-
- **e2e:** Remove log ([4fda203](https://github.com/wxt-dev/wxt/commit/4fda203))
-
-### 🤖 CI
-
- Fix codecov warning in release workflow ([7c6973f](https://github.com/wxt-dev/wxt/commit/7c6973f))
- Upgrade `pnpm/action-setup` to v3 ([905bfc7](https://github.com/wxt-dev/wxt/commit/905bfc7))
-
-## v0.16.10
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.9...v0.16.10)
-
-### 🚀 Enhancements
-
- Customize when content scripts are registered, in the manifest or at runtime ([#471](https://github.com/wxt-dev/wxt/pull/471))
-
-### 🩹 Fixes
-
- Don't assume react when importing JSX entrypoints during build ([#470](https://github.com/wxt-dev/wxt/pull/470))
- Respect `configFile` option ([#472](https://github.com/wxt-dev/wxt/pull/472))
-
-## v0.16.9
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.8...v0.16.9)
-
-### 🚀 Enhancements
-
- Support setting side panel options in HTML file ([#468](https://github.com/wxt-dev/wxt/pull/468))
-
-### 🩹 Fixes
-
- Fix order of ShadowRootUI hooks calling ([#459](https://github.com/wxt-dev/wxt/pull/459))
-
-### 📖 Documentation
-
- Add wrapper div to react's `createShadowRootUi` example ([bc24ea4](https://github.com/wxt-dev/wxt/commit/bc24ea4))
-
-### 🏡 Chore
-
- Simplify entrypoint types ([#464](https://github.com/wxt-dev/wxt/pull/464))
-
-### ❤️ Contributors
-
- Okou ([@ookkoouu](https://github.com/ookkoouu))
-
-## v0.16.8
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.7...v0.16.8)
-
-### 🩹 Fixes
-
- Watch files outside project root during development ([#454](https://github.com/wxt-dev/wxt/pull/454))
-
-### 📖 Documentation
-
- Add loading and error states for "Who's using WXT" section ([447a48f](https://github.com/wxt-dev/wxt/commit/447a48f))
-
-## v0.16.7
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.6...v0.16.7)
-
-### 🚀 Enhancements
-
- Generate ESLint globals file for auto-imports ([#450](https://github.com/wxt-dev/wxt/pull/450))
-
-### 🔥 Performance
-
- Upgrade Vite to 5.1 ([#452](https://github.com/wxt-dev/wxt/pull/452))
-
-### 📖 Documentation
-
- Add section about dev mode differences ([a0d1643](https://github.com/wxt-dev/wxt/commit/a0d1643))
- Remove anchor from content script ui examples ([87a62a1](https://github.com/wxt-dev/wxt/commit/87a62a1))
-
-### 🏡 Chore
-
- **e2e:** Use `wxt prepare` instead of `wxt build` when possible to speed up E2E tests ([#451](https://github.com/wxt-dev/wxt/pull/451))
-
-## v0.16.6
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.5...v0.16.6)
-
-### 🚀 Enhancements
-
- Add option to customize the analysis artifacts output ([#431](https://github.com/wxt-dev/wxt/pull/431))
-
-### 🩹 Fixes
-
- Use `insertBefore` on mounting content script UI ([ba85fdf](https://github.com/wxt-dev/wxt/commit/ba85fdf))
-
-### 💅 Refactors
-
- Use `Element.prepend` on mounting UI ([295f860](https://github.com/wxt-dev/wxt/commit/295f860))
-
-### 📖 Documentation
-
- Fix `createShadowRootUi` unmount calls ([946072f](https://github.com/wxt-dev/wxt/commit/946072f))
-
-### 🏡 Chore
-
- Enable skipped test since it works now ([6b8dfdf](https://github.com/wxt-dev/wxt/commit/6b8dfdf))
-
-### ❤️ Contributors
-
- Lionelhorn ([@Lionelhorn](https://github.com/Lionelhorn))
- Okou ([@ookkoouu](https://github.com/ookkoouu))
-
-## v0.16.5
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.4...v0.16.5)
-
-### 🩹 Fixes
-
- Support node 20 when running `wxt submit` ([e835502](https://github.com/wxt-dev/wxt/commit/e835502))
-
-### 📖 Documentation
-
- Remove "coming soon" from automated publishing feature ([2b374b9](https://github.com/wxt-dev/wxt/commit/2b374b9))
-
-## v0.16.4
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.3...v0.16.4)
-
-### 🚀 Enhancements
-
- Automatically convert MV3 `web_accessible_resources` to MV2 ([#423](https://github.com/wxt-dev/wxt/pull/423))
- Add option to customize the analysis output filename ([#426](https://github.com/wxt-dev/wxt/pull/426))
-
-### 🩹 Fixes
-
- Don't use immer for `transformManifest` ([#424](https://github.com/wxt-dev/wxt/pull/424))
- Exclude analysis files from the build summary ([#425](https://github.com/wxt-dev/wxt/pull/425))
-
-### 🏡 Chore
-
- Fix fake path in test data generator ([d0f1c70](https://github.com/wxt-dev/wxt/commit/d0f1c70))
-
-## v0.16.3
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.2...v0.16.3)
-
-### 🚀 Enhancements
-
- Hooks ([#419](https://github.com/wxt-dev/wxt/pull/419))
-
-### 🩹 Fixes
-
- **init:** Use `ungh` to prevent rate limits when loading templates ([37ad2c7](https://github.com/wxt-dev/wxt/commit/37ad2c7))
-
-### 📖 Documentation
-
- Fix typo of intuitive ([#415](https://github.com/wxt-dev/wxt/pull/415))
- Fix typo of opinionated ([#416](https://github.com/wxt-dev/wxt/pull/416))
-
-### 🏡 Chore
-
- Add dependabot for github actions ([#404](https://github.com/wxt-dev/wxt/pull/404))
- **deps-dev:** Bump happy-dom from 12.10.3 to 13.3.8 ([#411](https://github.com/wxt-dev/wxt/pull/411))
- **deps-dev:** Bump typescript from 5.3.2 to 5.3.3 ([#409](https://github.com/wxt-dev/wxt/pull/409))
- Register global `wxt` instance ([#418](https://github.com/wxt-dev/wxt/pull/418))
-
-### ❤️ Contributors
-
- Chen Hua ([@hcljsq](https://github.com/hcljsq))
- Florian Metz ([@Timeraa](http://github.com/Timeraa))
-
-## v0.16.2
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.1...v0.16.2)
-
-### 🩹 Fixes
-
- Don't crash background service worker when using `import.meta.url` ([#402](https://github.com/wxt-dev/wxt/pull/402))
-
-## v0.16.1
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.16.0...v0.16.1)
-
-### 🩹 Fixes
-
- Don't require config to run `wxt submit init` ([9318346](https://github.com/wxt-dev/wxt/commit/9318346))
-
-### 📖 Documentation
-
- Add premid extension to homepage ([#399](https://github.com/wxt-dev/wxt/pull/399))
-
-### 🏡 Chore
-
- **templates:** Upgrade to wxt `^0.16.0` ([f0b2a12](https://github.com/wxt-dev/wxt/commit/f0b2a12))
-
-### ❤️ Contributors
-
- Florian Metz ([@Timeraa](http://github.com/Timeraa))
-
-## v0.16.0
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.15.4...v0.16.0)
-
-### 🚀 Enhancements
-
- ⚠️  ESM background support ([#398](https://github.com/wxt-dev/wxt/pull/398))
-
-### 📖 Documentation
-
- Document how to opt into ESM ([1e12ce2](https://github.com/wxt-dev/wxt/commit/1e12ce2))
-
-### 🏡 Chore
-
- **deps-dev:** Bump lint-staged from 15.2.0 to 15.2.1 ([#395](https://github.com/wxt-dev/wxt/pull/395))
- **deps-dev:** Bump p-map from 7.0.0 to 7.0.1 ([#396](https://github.com/wxt-dev/wxt/pull/396))
- **deps-dev:** Bump @vitest/coverage-v8 from 1.0.1 to 1.2.2 ([#397](https://github.com/wxt-dev/wxt/pull/397))
-
-#### ⚠️ Breaking Changes
-
-In [#398](https://github.com/wxt-dev/wxt/pull/398), HTML pages' JS entrypoints in the output directory have been moved. Unless you're doing some kind of post-build work referencing files, you don't have to make any changes.
-
- Before:
-   ```
-   .output/
-     <target>/
-       chunks/
-         some-shared-chunk-<hash>.js
-         popup-<hash>.js
-       popup.html
-   ```
- After:
-   ```
-   .output/
-     <target>/
-       chunks/
-         some-shared-chunk-<hash>.js
-       popup.html
-       popup.js
-   ```
-
-This effects all HTML files, not just the Popup. The hash has been removed, and it's been moved to the root of the build target folder, not inside the `chunks/` directory. Moving files like this has not historically increased review times or triggered in-depth reviews when submitting updates to the stores.
-
-## v0.15.4
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.15.3...v0.15.4)
-
-### 🩹 Fixes
-
- **submit:** Load `.env.submit` automatically when running `wxt submit` and `wxt submit init` ([#391](https://github.com/wxt-dev/wxt/pull/391))
-
-## v0.15.3
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.15.2...v0.15.3)
-
-### 🩹 Fixes
-
- **dev:** Reload `<name>/index.html` entrypoints properly on save ([#390](https://github.com/wxt-dev/wxt/pull/390))
-
-## v0.15.2
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.15.1...v0.15.2)
-
-### 🚀 Enhancements
-
- Add `submit` command ([#370](https://github.com/wxt-dev/wxt/pull/370))
-
-### 🩹 Fixes
-
- **dev:** Resolve `script` and `link` aliases ([#387](https://github.com/wxt-dev/wxt/pull/387))
-
-### ❤️ Contributors
-
- Nenad Novaković ([@dvlden](https://github.com/dvlden))
-
-## v0.15.1
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.15.0...v0.15.1)
-
-### 🚀 Enhancements
-
- Allow passing custom preferences to chrome, enabling dev mode on `chrome://extensions` and allowing content script sourcemaps automatically ([#384](https://github.com/wxt-dev/wxt/pull/384))
-
-### 🩹 Fixes
-
- **security:** Upgrade to vite@5.0.12 to resolve CVE-2024-23331 ([39b76d3](https://github.com/wxt-dev/wxt/commit/39b76d3))
-
-### 📖 Documentation
-
- Fixed doc errors on the guide/extension-api page ([#383](https://github.com/wxt-dev/wxt/pull/383))
-
-### 🏡 Chore
-
- Fix vite version conflicts in demo extension ([98d2792](https://github.com/wxt-dev/wxt/commit/98d2792))
-
-### ❤️ Contributors
-
- 0x7a7a ([@0x7a7a](https://github.com/0x7a7a))
-
-## v0.15.0
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.7...v0.15.0)
-
-### 🚀 Enhancements
-
- **zip:** ⚠️  Add `includeSources` and rename `ignoredSources` to `excludeSources` ([#378](https://github.com/wxt-dev/wxt/pull/378))
-
-### 🩹 Fixes
-
- Generate missing sourcemap in `wxt:unimport` plugin ([#381](https://github.com/wxt-dev/wxt/pull/381))
- ⚠️  Move browser constants to `import.meta.env` ([#380](https://github.com/wxt-dev/wxt/pull/380))
- Enable inline sourcemaps by default during development ([#382](https://github.com/wxt-dev/wxt/pull/382))
-
-### 📖 Documentation
-
- Fix typo ([f9718a1](https://github.com/wxt-dev/wxt/commit/f9718a1))
-
-### 🏡 Chore
-
- Update contributor docs ([eb758bd](https://github.com/wxt-dev/wxt/commit/eb758bd))
-
-#### ⚠️ Breaking Changes
-
-Renamed `zip.ignoredSources` to `zip.excludeSources` in [#378](https://github.com/wxt-dev/wxt/pull/378)
-
-Renamed undocumented constants for detecting the build config at runtime in [#380](https://github.com/wxt-dev/wxt/pull/380). Now documented here: https://wxt.dev/guide/multiple-browsers.html#runtime
-
- `__BROWSER__` &rarr; `import.meta.env.BROWSER`
- `__COMMAND__` &rarr; `import.meta.env.COMMAND`
- `__MANIFEST_VERSION__` &rarr; `import.meta.env.MANIFEST_VERSION`
- `__IS_CHROME__` &rarr; `import.meta.env.CHROME`
- `__IS_FIREFOX__` &rarr; `import.meta.env.FIREFOX`
- `__IS_SAFARI__` &rarr; `import.meta.env.SAFARI`
- `__IS_EDGE__` &rarr; `import.meta.env.EDGE`
- `__IS_OPERA__` &rarr; `import.meta.env.OPERA`
-
-### ❤️ Contributors
-
- Nenad Novaković ([@dvlden](https://github.com/dvlden))
-
-## v0.14.7
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.6...v0.14.7)
-
-### 🩹 Fixes
-
- Improve error messages when importing and building entrypoints ([3b63a51](https://github.com/wxt-dev/wxt/commit/3b63a51))
- **storage:** Throw better error message when importing outside a extension environment ([35865ad](https://github.com/wxt-dev/wxt/commit/35865ad))
- Upgrade `web-ext-run` ([62ecb6f](https://github.com/wxt-dev/wxt/commit/62ecb6f))
-
-### 📖 Documentation
-
- Add `matches` to content script examples ([dab8efa](https://github.com/wxt-dev/wxt/commit/dab8efa))
- Fix incorrect sample code ([#372](https://github.com/wxt-dev/wxt/pull/372))
- Document defined constants for the build target ([68874e6](https://github.com/wxt-dev/wxt/commit/68874e6))
- Add missing `await` to `createShadowRootUi` examples ([fc45c37](https://github.com/wxt-dev/wxt/commit/fc45c37))
-
-### ❤️ Contributors
-
- 東奈比 ([@dongnaebi](http://github.com/dongnaebi))
-
-## v0.14.6
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.5...v0.14.6)
-
-### 🚀 Enhancements
-
- Restart dev mode when saving config ([#365](https://github.com/wxt-dev/wxt/pull/365))
- Add basic validation for entrypoint options ([#368](https://github.com/wxt-dev/wxt/pull/368))
-
-### 🩹 Fixes
-
- Add subdependency bin directory so `wxt build --analyze` works with PNPM ([#363](https://github.com/wxt-dev/wxt/pull/363))
- Sort build output files naturally ([#364](https://github.com/wxt-dev/wxt/pull/364))
-
-### 🤖 CI
-
- Check for type errors in demo before building ([4b005b4](https://github.com/wxt-dev/wxt/commit/4b005b4))
-
-## v0.14.5
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.4...v0.14.5)
-
-### 🚀 Enhancements
-
- Add `dev.reloadCommand` config ([#362](https://github.com/wxt-dev/wxt/pull/362))
-
-### 🩹 Fixes
-
- Disable reload dev command when 4 commands are already registered ([#361](https://github.com/wxt-dev/wxt/pull/361))
-
-## v0.14.4
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.3...v0.14.4)
-
-### 🩹 Fixes
-
- Allow requiring built-in node modules from ESM CLI ([#356](https://github.com/wxt-dev/wxt/pull/356))
-
-### 🏡 Chore
-
- Add unit tests for passing flags via the CLI ([#354](https://github.com/wxt-dev/wxt/pull/354))
-
-## v0.14.3
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.2...v0.14.3)
-
-### 🩹 Fixes
-
- Make `getArrayFromFlags` result can be undefined ([#352](https://github.com/wxt-dev/wxt/pull/352))
-
-### ❤️ Contributors
-
- Yuns ([@yunsii](http://github.com/yunsii))
-
-## v0.14.2
-
-[compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.1...v0.14.2)
-
-### 🚀 Enhancements
-
- Add `filterEntrypoints` option to speed up development ([#344](https://github.com/wxt-dev/wxt/pull/344))
-
-### 🔥 Performance
-
- Only call `findEntrypoint` once per build ([#342](https://github.com/wxt-dev/wxt/pull/342))
-
-### 🩹 Fixes
-
- Improve error message and document use of imported variables outside an entrypoint's `main` function ([#346](https://github.com/wxt-dev/wxt/pull/346))
- Allow `browser.runtime.getURL` to include hashes and query params for HTML paths ([#350](https://github.com/wxt-dev/wxt/pull/350))
-
-### 📖 Documentation
-
- Fix typos and outdated ui function usage ([#347](https://github.com/wxt-dev/wxt/pull/347))
-
-### 🏡 Chore
-
- Update templates to `^0.14.0` ([70a4961](https://github.com/wxt-dev/wxt/commit/70a4961))
- Fix typo in function name ([a329e24](https://github.com/wxt-dev/wxt/commit/a329e24))
-
-### ❤️ Contributors
-
- Yuns ([@yunsii](http://github.com/yunsii))
- Armin
-
 ## v0.14.1

 [compare changes](https://github.com/wxt-dev/wxt/compare/v0.14.0...v0.14.1)
@@ -930,7 +385,7 @@ Renamed undocumented constants for detecting the build config at runtime in [#38

 ### 🏡 Chore

- Remove whitespace from generated `.wxt` files ([#211](https://github.com/wxt-dev/wxt/pull/211))
+- Remove whitespace from genearted `.wxt` files ([#211](https://github.com/wxt-dev/wxt/pull/211))
 - Upgrade templates to `wxt@^0.9.0` ([#214](https://github.com/wxt-dev/wxt/pull/214))
 - Update Vite dependency range to `^4.0.0 || ^5.0.0-0` ([f1e8084](https://github.com/wxt-dev/wxt/commit/f1e8084be89e512dde441b9197a99183c497f67d))

@@ -1438,8 +893,8 @@ Renamed undocumented constants for detecting the build config at runtime in [#38
 - **deps-dev:** Bump vitest from 0.34.1 to 0.34.3 ([#99](https://github.com/wxt-dev/wxt/pull/99))
 - Increase E2E test timeout because GitHub Actions Window runner is slow ([2a0842b](https://github.com/wxt-dev/wxt/commit/2a0842b))
 - **deps-dev:** Bump vitepress from 1.0.0-rc.4 to 1.0.0-rc.10 ([#96](https://github.com/wxt-dev/wxt/pull/96))
- Fix test watcher restarting indefinitely ([2c7922c](https://github.com/wxt-dev/wxt/commit/2c7922c))
- Remove explicit icon config from templates ([93bfee0](https://github.com/wxt-dev/wxt/commit/93bfee0))
+- Fix test watcher restarting indefinetly ([2c7922c](https://github.com/wxt-dev/wxt/commit/2c7922c))
+- Remove explict icon config from templates ([93bfee0](https://github.com/wxt-dev/wxt/commit/93bfee0))
 - Use import aliases in Vue template ([#104](https://github.com/wxt-dev/wxt/pull/104))

 #### ⚠️ Breaking Changes
@@ -1499,7 +954,7 @@ Renamed undocumented constants for detecting the build config at runtime in [#38
 - Branding and logo ([#60](https://github.com/wxt-dev/wxt/pull/60))
 - Simplify binary setup ([#62](https://github.com/wxt-dev/wxt/pull/62))
 - Add Solid template ([#63](https://github.com/wxt-dev/wxt/pull/63))
- Increase E2E test timeout to fix flakey test ([dfe424f](https://github.com/wxt-dev/wxt/commit/dfe424f))
+- Increate E2E test timeout to fix flakey test ([dfe424f](https://github.com/wxt-dev/wxt/commit/dfe424f))

 ### 🤖 CI

@@ -1775,7 +1230,7 @@ Initial release of WXT. Full support for production builds and initial toolkit f
 - Export and bootstrap the `/client` package ([5b07c95](https://github.com/wxt-dev/wxt/commit/5b07c95))
 - Resolve entrypoints based on filesystem ([a63f061](https://github.com/wxt-dev/wxt/commit/a63f061))
 - Separate output directories for each browser/manifest version ([f09ffbb](https://github.com/wxt-dev/wxt/commit/f09ffbb))
- Build entrypoints and output `manifest.json` ([1e7c738](https://github.com/wxt-dev/wxt/commit/1e7c738))
+- Build entrypoints and output `manfiest.json` ([1e7c738](https://github.com/wxt-dev/wxt/commit/1e7c738))
 - Automatically add CSS files to content scripts ([047ce04](https://github.com/wxt-dev/wxt/commit/047ce04))
 - Download and bundle remote URL imports ([523c7df](https://github.com/wxt-dev/wxt/commit/523c7df))
 - Generate type declarations and config for project types and auto-imports ([21debad](https://github.com/wxt-dev/wxt/commit/21debad))
@@ -57,17 +57,9 @@ pnpm test
 pnpm docs:dev
 ```

-## Updating Docs
-
-Documentation is written with VitePress, and is located in the `docs/` directory.
-
-The API reference is generated from JSDoc comments in the source code. If there's a typo or change you want to make in there, you'll need to update the source code instead of a file in the `docs/` directory.
-
 ## Testing

-WXT has unit and E2E tests. When making a change or adding a feature, make sure to update the tests or add new ones, if they exist.
-
-> If they don't exist, feel free to create them, but that's a lot for a one-time contributor. A maintainer might add them to your PR though.
+WXT has unit and E2E tests. When making a change or adding a feature, make sure to update the tests or add new ones.

 To run tests for a specific file, add the filename at the end of the test command:

@@ -108,7 +100,7 @@ Then run `npm i` again.
 To add a template, copy the vanilla template and give it a new name.

 ```sh
-cp -r templates/vanilla templates/<new-template-name>
+cp -r templates/vailla templates/<new-template-name>
 ```

 That's it. Once your template is merged, it will be available inside `wxt init` immediately. You don't need to release a new version of WXT to release a new template.
@@ -55,11 +55,14 @@ Or see the [installation guide](https://wxt.dev/guide/installation.html) to get
 - 📂 File based entrypoints
 - 🚔 TypeScript
 - 🦾 Auto-imports
- 🤖 Automated publishing
+- ⬇️ Download and bundle remote URL imports
 - 🎨 Frontend framework agnostic: works with Vue, React, Svelte, etc
 - 🖍️ Quickly bootstrap a new project
 - 📏 Bundle analysis
- ⬇️ Download and bundle remote URL imports
+
+### Coming Soon
+
+- 🤖 Automated publishing

 ## Contributors

@@ -19,7 +19,7 @@
  "dependencies": {
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
-    "vitest": "^1.2.2"
+    "vitest": "^1.1.0"
  },
  "devDependencies": {
    "@types/react": "^18.2.34",
@@ -1,42 +1,43 @@
-import messages from 'public/_locales/en/messages.json';
+export default defineBackground(() => {
+  console.log(browser.runtime.id);
+  logId();
+  console.log({
+    browser: __BROWSER__,
+    chrome: __IS_CHROME__,
+    firefox: __IS_FIREFOX__,
+    manifestVersion: __MANIFEST_VERSION__,
+  });

-export default defineBackground({
-  // type: 'module',
+  // @ts-expect-error: should only accept entrypoints or public assets
+  browser.runtime.getURL('/');
+  browser.runtime.getURL('/background.js');
+  browser.runtime.getURL('/icon-128.png');

-  main() {
-    console.log(browser.runtime.id);
-    logId();
-    console.log({
-      url: import.meta.url,
-      browser: import.meta.env.BROWSER,
-      chrome: import.meta.env.CHROME,
-      firefox: import.meta.env.FIREFOX,
-      manifestVersion: import.meta.env.MANIFEST_VERSION,
-      messages,
-    });
+  console.log([
+    // @ts-expect-error: browser.i18n should only accept known message names
+    browser.i18n.getMessage('test'),
+    browser.i18n.getMessage('promptForName'),
+    browser.i18n.getMessage('hello', ['Aaron']),
+    browser.i18n.getMessage('bye', ['Aaron']),
+    browser.i18n.getMessage('@@extension_id'),
+    browser.i18n.getMessage('nItems'),
+  ]);

-    // @ts-expect-error: should only accept entrypoints or public assets
-    browser.runtime.getURL('/');
-    browser.runtime.getURL('/background.js');
-    browser.runtime.getURL('/icon/128.png');
-    browser.runtime.getURL('/example.html#hash');
-    browser.runtime.getURL('/example.html?query=param');
-    // @ts-expect-error: should only allow hashes/query params on HTML files
-    browser.runtime.getURL('/icon-128.png?query=param');
+  console.log([
+    // @ts-expect-error: i18n should only accept known message names
+    i18n.t('test'),
+    i18n.t('promptForName'),
+    i18n.t('hello', ['Aaron']),
+    i18n.t('bye', ['Aaron']),
+    i18n.t('@@extension_id'),
+    i18n.tp('nItems', 0, ['0']),
+  ]);

-    // @ts-expect-error: should only accept known message names
-    browser.i18n.getMessage('test');
-    browser.i18n.getMessage('prompt_for_name');
-    browser.i18n.getMessage('hello', 'Aaron');
-    browser.i18n.getMessage('bye', ['Aaron']);
-    browser.i18n.getMessage('@@extension_id');
+  console.log('WXT MODE:', {
+    MODE: import.meta.env.MODE,
+    DEV: import.meta.env.DEV,
+    PROD: import.meta.env.PROD,
+  });

-    console.log('WXT MODE:', {
-      MODE: import.meta.env.MODE,
-      DEV: import.meta.env.DEV,
-      PROD: import.meta.env.PROD,
-    });
-
-    storage.setItem('session:startTime', Date.now());
-  },
+  storage.setItem('session:startTime', Date.now());
 });
@@ -0,0 +1,21 @@
+promptForName: What's your name?
+hello:
+  message: Hello, $USER$
+  description: Greet the user
+  placeholders:
+    user:
+      content: $1
+      example: Paul
+bye:
+  message: Goodbye, $USER$. Come back to $OUR_SITE$ soon!
+  description: Say goodbye to the user
+  placeholders:
+    our_site:
+      content: Example.com
+    user:
+      content: $1
+      example: Paul
+nItems:
+  0: 0 items
+  1: 1 item
+  n: $1 items
@@ -1,29 +0,0 @@
-{
-  "prompt_for_name": {
-    "message": "What's your name?",
-    "description": "Ask for the user's name"
-  },
-  "hello": {
-    "message": "Hello, $USER$",
-    "description": "Greet the user",
-    "placeholders": {
-      "user": {
-        "content": "$1",
-        "example": "Cira"
-      }
-    }
-  },
-  "bye": {
-    "message": "Goodbye, $USER$. Come back to $OUR_SITE$ soon!",
-    "description": "Say goodbye to the user",
-    "placeholders": {
-      "our_site": {
-        "content": "Example.com"
-      },
-      "user": {
-        "content": "$1",
-        "example": "Cira"
-      }
-    }
-  }
-}
@@ -17,15 +17,13 @@ const chromeExtensionIds = [
  'okifoaikfmpfcamplcfjkpdnhfodpkil', // Doozy: Ai Made Easy
  'lknmjhcajhfbbglglccadlfdjbaiifig', // tl;dv - Record, Transcribe & ChatGPT for Google Meet
  'youtube中文配音/oglffgiaiekgeicdgkdlnlkhliajdlja', // Youtube中文配音
-  'agjnjboanicjcpenljmaaigopkgdnihi', // PreMiD
 ];

-const { data, err, isLoading } = useListExtensionDetails(chromeExtensionIds);
+const { data } = useListExtensionDetails(chromeExtensionIds);
 const sortedExtensions = computed(() => {
  if (!data.value?.length) return [];

  return [...data.value]
-    .filter((item) => item != null)
    .map((item) => ({
      ...item,
      // Sort based on the user count weighted by the rating
@@ -50,16 +48,7 @@ function getStoreUrl(extension: ChromeExtension) {
        Battle tested and ready for production. Explore chrome extensions made
        with WXT.
      </p>
-      <p v-if="isLoading" style="text-align: center; opacity: 50%">
-        Loading...
-      </p>
-      <p
-        v-else-if="err || sortedExtensions.length === 0"
-        style="text-align: center; opacity: 50%"
-      >
-        Failed to load extension details.
-      </p>
-      <ul v-else>
+      <ul>
        <li
          v-for="extension of sortedExtensions"
          :key="extension.id"
@@ -26,7 +26,6 @@ const query = `query ${operationName}($ids:[String!]!) {
 export default function (ids: string[]) {
  const data = ref<ChromeExtension[]>();
  const err = ref<unknown>();
-  const isLoading = ref(true);

  fetch('https://queue.wxt.dev/api', {
    method: 'POST',
@@ -37,7 +36,6 @@ export default function (ids: string[]) {
    }),
  })
    .then(async (res) => {
-      isLoading.value = false;
      const {
        data: { chromeExtensions },
      } = await res.json();
@@ -45,7 +43,6 @@ export default function (ids: string[]) {
      err.value = undefined;
    })
    .catch((error) => {
-      isLoading.value = false;
      console.error(error);
      data.value = undefined;
      err.value = error;
@@ -54,6 +51,5 @@ export default function (ids: string[]) {
  return {
    data,
    err,
-    isLoading,
  };
 }
@@ -89,8 +89,8 @@ export default defineConfig({
            { text: 'Storage', link: '/guide/storage.md' },
            { text: 'Assets', link: '/guide/assets.md' },
            { text: 'Content Script UI', link: '/guide/content-script-ui.md' },
+            { text: 'Localization', link: '/guide/localization.md' },
            { text: 'Multiple Browsers', link: '/guide/multiple-browsers.md' },
-            { text: 'ES Modules', link: '/guide/esm.md' },
            { text: 'Auto-imports', link: '/guide/auto-imports.md' },
            { text: 'Vite', link: '/guide/vite.md' },
            { text: 'Remote Code', link: '/guide/remote-code.md' },
@@ -16,7 +16,7 @@ For MV2, the background is added as a script to the background page. For MV3, th
 ## Definition

 :::warning
-The main function of the background **_CANNOT BE ASYNC_**. Event listeners must be added synchronously on background startup. If your main function returns a promise, WXT will log an error.
+The main function of the background **_CANNOT BE ASYNC_**. Event listeners must be added syncronously on background startup. If your main function returns a promise, WXT will log an error.
 :::

 ```ts
@@ -37,9 +37,6 @@ export default defineContentScript({
  // Configure how CSS is injected onto the page
  cssInjectionMode: undefined | "manifest" | "manual" | "ui",

-  // Configure how/when content script will be registered
-  registration: undefined | "manifest" | "runtime",
-
  main(ctx) {
    // Executed when content script is loaded
  },
@@ -2,7 +2,7 @@

 WXT can build CSS entrypoints individually. CSS entrypoints are always unlisted.

-See [Content Script CSS](/entrypoints/content-scripts#css) documentation for the recommended approach to include CSS with a content script.
+See [Content Script CSS](/entrypoints/content-scripts#css) documentation for the recomended approach to include CSS with a content script.

 :::info
 If the recommended approach doesn't work for your use case, you can use any of the filename patterns below to build the styles separate from the JS and use the [`transformManifest` hook](/api/wxt/interfaces/InlineConfig#transformmanifest) to manually add your CSS file to the manifest.
@@ -2,10 +2,8 @@

 [Chrome Docs](https://developer.chrome.com/docs/extensions/reference/sidePanel/) &bull; [Firefox Docs](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/user_interface/Sidebars)

-In Chrome, side panels use the "side_panel" API, while Firefox uses the "sidebar_action" API.
-
 :::warning
-Chrome added support for sidepanels in Manifest V3, they are not available in Manifest V2.
+Chrome added support for sidepanels in Manifest V3, they are not available in Manfiest V2.
 :::

 ## Filenames
@@ -27,17 +25,7 @@ Chrome added support for sidepanels in Manifest V3, they are not available in Ma
  <head>
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Default Side Panel Title</title>
-    <meta
-      name="manifest.default_icon"
-      content="{
-        16: '/icon-16.png',
-        24: '/icon-24.png',
-        ...
-      }"
-    />
-    <meta name="manifest.open_at_install" content="true|false" />
-    <meta name="manifest.browser_style" content="true|false" />
+    <title>Title</title>
    <!-- Set include/exclude if the page should be removed from some builds -->
    <meta name="manifest.include" content="['chrome', ...]" />
    <meta name="manifest.exclude" content="['chrome', ...]" />
@@ -65,7 +65,7 @@ import { defineConfig } from 'wxt';

 export default defineConfig({
  imports: {
-    // Add auto-imports for vue functions like createApp, ref, computed, watch, toRaw, etc...
+    // Add auto-imports for vue fuctions like createApp, ref, computed, watch, toRaw, etc...
    presets: ['vue'],
  },
 });
@@ -40,7 +40,7 @@ WXT's main goal is improving the development experience (DX) of creating web ext

 Opening a browser automatically makes it super easy to start and stop development without having to manually load the extension in your browser.

-Reloading each part of the extension individually improves your iteration speed while developing UIs. This is because reloading the entire extension on every change will close the popup and any tabs open to an extension page, like options. If you save a file associated with a UI and a content script while working on the UI, it will randomly close because it needed to reload the extension when the content script changed. This interrupts your development flow and is really annoying.
+Reloading each part of the extension individually improves your iteration speed while developing UIs. This is because reloading the entire extension on every change will close the popup and any tabs open to an extension page, like options. If you save a file associated with a UI and a content script while working on the UI, it will randomly close because it needed to reload the extension when the content script changed. This interupts your development flow and is really annoying.

 WXT solves this problem by reloading HTML pages and content scripts individually (when possible) to keep your UIs open while you develop them. This is a MV3 feature, so if you're developing a MV2 extension, you'll get the same dev experience as Plasmo.

@@ -1,6 +1,6 @@
 # Configuration

-WXT's behavior can be configured via the `wxt.config.ts` file. In this file, you can add Vite plugins, change the directory structure of your project, and set fields on your `manifest.json`.
+WXT's behavior can be configured via the `wxt.config.ts` file. In this file, you can add Vite plugins, change the directory strucutre of your project, and set fields on your `manifest.json`.

 ## Config File

@@ -21,11 +21,10 @@ Integrated content script UIs are injected alongside the content of a page. This
 ```ts [Vanilla]
 // entrypoints/example-ui.content.ts
 export default defineContentScript({
-  matches: ['<all_urls>'],
-
  main(ctx) {
    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
        // Append children to the container
        const app = document.createElement('p');
@@ -46,11 +45,10 @@ import { createApp } from 'vue';
 import App from './App.vue';

 export default defineContentScript({
-  matches: ['<all_urls>'],
-
  main(ctx) {
    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
        // Create the app and mount it to the UI container
        const app = createApp(App);
@@ -75,11 +73,10 @@ import ReactDOM from 'react-dom/client';
 import App from './App.tsx';

 export default defineContentScript({
-  matches: ['<all_urls>'],
-
  main(ctx) {
    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
        // Create a root on the UI container and render a component
        const root = ReactDOM.createRoot(container);
@@ -98,16 +95,15 @@ export default defineContentScript({
 });
 ```

-```ts [Svelte]
+```ts [Svelete]
 // entrypoints/example-ui.content/index.ts
 import App from './App.svelte';

 export default defineContentScript({
-  matches: ['<all_urls>'],
-
  main(ctx) {
    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
        // Create the Svelte app inside the UI container
        const app = new App({
@@ -132,11 +128,10 @@ export default defineContentScript({
 import { render } from 'solid-js/web';

 export default defineContentScript({
-  matches: ['<all_urls>'],
-
  main(ctx) {
    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
        // Render your app to the UI container
        const unmount = render(() => <div>...</div>, container);
@@ -157,7 +152,7 @@ export default defineContentScript({

 See the [API Reference](/api/wxt/client/functions/createIntegratedUi) for the complete list of options.

-You can control how CSS is injected for an integrated content script UI with the [`cssInjectionMode`](/api/wxt/interfaces/BaseContentScriptEntrypointOptions#cssinjectionmode) property. Usually, you'll want to leave it as `"manifest"`, the default, so the UI inherits its style from the website's CSS.
+You can control how CSS is injected for an integrated content script UI with the [`cssInjectionMode`](/api/wxt/interfaces/ContentScriptBaseDefinition#cssinjectionmode) property. Usually, you'll want to leave it as `"manifest"`, the default, so the UI inherits its style from the website's CSS.

 ## Shadow Root

@@ -168,7 +163,7 @@ WXT's [`createShadowRootUi`](/api/wxt/client/functions/createShadowRootUi) abstr
 To use `createShadowRootUi`, follow these steps:

 1. Import your CSS file at the top of your content script
-2. Set [`cssInjectionMode: "ui"`](/api/wxt/interfaces/BaseContentScriptEntrypointOptions#cssinjectionmode) inside `defineContentScript`
+2. Set [`cssInjectionMode: "ui"`](/api/wxt/interfaces/ContentScriptBaseDefinition#cssinjectionmode) inside `defineContentScript`
 3. Define your UI with `createShadowRootUi()`
 4. Mount the UI so it is visible to users

@@ -179,7 +174,6 @@ To use `createShadowRootUi`, follow these steps:
 import './style.css';

 export default defineContentScript({
-  matches: ['<all_urls>'],
  // 2. Set cssInjectionMode
  cssInjectionMode: 'ui',

@@ -187,7 +181,8 @@ export default defineContentScript({
    // 3. Define your UI
    const ui = await createShadowRootUi(ctx, {
      name: 'example-ui',
-      position: 'inline',
+      anchor: '#anchor',
+      type: 'inline',
      onMount(container) {
        // Define how your UI will be mounted inside the container
        const app = document.createElement('p');
@@ -209,7 +204,6 @@ import { createApp } from 'vue';
 import App from './App.vue';

 export default defineContentScript({
-  matches: ['<all_urls>'],
  // 2. Set cssInjectionMode
  cssInjectionMode: 'ui',

@@ -217,7 +211,8 @@ export default defineContentScript({
    // 3. Define your UI
    const ui = await createShadowRootUi(ctx, {
      name: 'example-ui',
-      position: 'inline',
+      anchor: '#anchor',
+      type: 'inline',
      onMount: (container) => {
        // Define how your UI will be mounted inside the container
        const app = createApp(App);
@@ -226,7 +221,7 @@ export default defineContentScript({
      },
      onRemove: (app) => {
        // Unmount the app when the UI is removed
-        app?.unmount();
+        app.unmount();
      },
    });

@@ -243,28 +238,23 @@ import ReactDOM from 'react-dom/client';
 import App from './App.tsx';

 export default defineContentScript({
-  matches: ['<all_urls>'],
  // 2. Set cssInjectionMode
  cssInjectionMode: 'ui',

-  async main(ctx) {
+  main(ctx) {
    // 3. Define your UI
-    const ui = await createShadowRootUi(ctx, {
-      name: 'example-ui',
+    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
-        // Container is a body, and React warns when creating a root on the body, so create a wrapper div
-        const app = document.createElement('div');
-        container.append(app);
-
        // Create a root on the UI container and render a component
-        const root = ReactDOM.createRoot(app);
+        const root = ReactDOM.createRoot(container);
        root.render(<App />);
        return root;
      },
      onRemove: (root) => {
        // Unmount the root when the UI is removed
-        root?.unmount();
+        root.unmount();
      },
    });

@@ -274,21 +264,20 @@ export default defineContentScript({
 });
 ```

-```ts [Svelte]
+```ts [Svelete]
 // 1. Import the style
 import './style.css';
 import App from './App.svelte';

 export default defineContentScript({
-  matches: ['<all_urls>'],
  // 2. Set cssInjectionMode
  cssInjectionMode: 'ui',

-  async main(ctx) {
+  main(ctx) {
    // 3. Define your UI
-    const ui = await createShadowRootUi(ctx, {
-      name: 'example-ui',
+    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
        // Create the Svelte app inside the UI container
        const app = new App({
@@ -298,7 +287,7 @@ export default defineContentScript({
      },
      onRemove: (app) => {
        // Destroy the app when the UI is removed
-        app?.$destroy();
+        app.$destroy();
      },
    });

@@ -314,22 +303,21 @@ import './style.css';
 import { render } from 'solid-js/web';

 export default defineContentScript({
-  matches: ['<all_urls>'],
  // 2. Set cssInjectionMode
  cssInjectionMode: 'ui',

-  async main(ctx) {
+  main(ctx) {
    // 3. Define your UI
-    const ui = await createShadowRootUi(ctx, {
-      name: 'example-ui',
+    const ui = createIntegratedUi(ctx, {
      position: 'inline',
+      anchor: '#anchor',
      onMount: (container) => {
        // Render your app to the UI container
        const unmount = render(() => <div>...</div>, container);
      },
      onRemove: (unmount) => {
        // Unmount the app when the UI is removed
-        unmount?.();
+        unmount();
      },
    });

@@ -368,7 +356,7 @@ WXT provides a helper function, [`createIframeUi`](/api/wxt/client/functions/cre
     </body>
   </html>
   ```
-1. Add the page to the manifest's `web_accessible_resources`
+1. Add the page to the manifest's `web_accessible_resouces`
   ```ts
   // wxt.config.ts
   export default defineConfig({
@@ -386,13 +374,13 @@ WXT provides a helper function, [`createIframeUi`](/api/wxt/client/functions/cre

   ```ts
   export default defineContentScript({
-     matches: ['<all_urls>'],
-
+     // ...
     async main(ctx) {
       // Define the UI
       const ui = await createIframeUi(ctx, {
         page: '/example-iframe.html',
-         position: 'inline',
+         anchor: '#anchor',
+         type: 'inline',
         onMount: (wrapper, iframe) => {
           // Add styles to the iframe like width
           iframe.width = 123;
@@ -13,24 +13,6 @@ WXT's main goal is providing the best DX it possibly can. When running your exte
 | `wxt.config.ts`     |     |                       |                  | 🟡 See [#10](https://github.com/wxt-dev/wxt/issues/10) |
 | `web-ext.config.ts` |     |                       |                  | 🟡 See [#10](https://github.com/wxt-dev/wxt/issues/10) |

-## Dev Mode vs Production Builds
-
-There are some notable differences between the development and production versions of an extension. During development:
-
-1. **Content scripts are not listed in the `manifest.json`** when targeting MV3. Instead, the [`scripting`](https://developer.chrome.com/docs/extensions/reference/api/scripting) permission is used to register content scripts at runtime so they can be reloaded individually.
-
-   To get the list of content scripts during development, run the following in the background's console:
-
-   ```ts
-   await chrome.scripting.getRegisteredContentScripts();
-   ```
-
-2. **The CSP is modified to allow loading scripts from the dev server**. Make sure you're using Chrome v110 or above for HMR to work.
-
-3. If you don't include a background script/service worker, one will be created to perform various tasks in dev mode, mostly related to reloading different parts of the extension on change.
-
-For production builds, none of the above modifications will be applied, and you're extension/manifest will only include what you have defined.
-
 ## Configure Browser Startup

 WXT uses [`web-ext` by Mozilla](https://github.com/mozilla/web-ext) to automatically open a browser with the extension installed. You can configure the runner's behavior via the [`runner`](/api/wxt/interfaces/InlineConfig#runner) option, or in a separate gitignored file, `web-ext.config.ts`.
@@ -59,7 +41,7 @@ export default defineRunnerConfig({

 ### Browser Binaries

-`web-ext`'s browser discovery is very limited. By default, it only guesses at where Chrome and Firefox are installed. If you've customized your install locations, you may need to tell `web-ext` where the binaries/executables are located using the [`binaries` option](/api/wxt/interfaces/ExtensionRunnerConfig#binaries). For other Chromium based browsers, like Edge or Opera, you'll need to explicitly list them in the `binaries` option as well, otherwise they will open in Chrome by default.
+`web-ext`'s browser discovery is very limitted. By default, it only guesses at where Chrome and Firefox are installed. If you've customized your install locations, you may need to tell `web-ext` where the binaries/executables are located using the [`binaries` option](/api/wxt/interfaces/ExtensionRunnerConfig#binaries). For other Chromium based browsers, like Edge or Opera, you'll need to explicitly list them in the `binaries` option as well, otherwise they will open in Chrome by default.

 ```ts
 // ~/web-ext.config.ts
@@ -101,6 +83,6 @@ Normally, to manually reload an extension, you have to visit `chrome://extension

 When running `wxt` command to start the dev server, WXT adds a keyboard shortcut, `ctrl+E` for Windows/Linux and `cmd+E` for Mac, that reloads the extension when pressed, without visiting `chrome://extensions`.

-:::info
+:::note
 This shortcut is only available during development, and is not be added to your extension when running `wxt build` or `wxt-zip`.
 :::
@@ -58,7 +58,7 @@ See [`/entrypoints` folder](/entrypoints/background) documentation for a full li

 ## Entrypoint Options

-Some entrypoints, like content scripts, actions, or the background, can receive additional options.
+Some entrypoints, like content scripts, actions, or the background, can recieve additional options.

 In HTML files, options are listed as `meta` tags:

@@ -86,56 +86,3 @@ export default defineContentScript({
 :::info
 For a full list of entrypoints and each of their options, see the [`/entrypoints` folder](/entrypoints/background) documentation.
 :::
-
-### Side Effects
-
-You cannot use imported variables outside the `main` function is JS entrypoints. This includes options, as shown below:
-
-```ts
-// entrypoints/content.ts
-import { GOOGLE_MATCHES } from '~/utils/match-patterns';
-
-export default defineContentScript({
-  matches: GOOGLE_MATCHES,
-  main() {
-    // ...
-  },
-});
-```
-
-```
-$ wxt build
-wxt build
-
-WXT 0.14.1
-ℹ Building chrome-mv3 for production with Vite 5.0.5
-✖ Command failed after 360 ms
-
-[8:55:54 AM]  ERROR  entrypoints/content.ts: Cannot use imported variable "GOOGLE_MATCHES" before main function. See https://wxt.dev/guide/entrypoints.html#side-effects
-```
-
-This throws an error because WXT needs to import each entrypoint during the build process to extract its definition (containing the `match`, `run_at`, `include`/`exclude`, etc.) to render the `manifest.json` correctly. Before loading an entrypoint, a transformation is applied to remove all imports. This prevents imported modules (local or NPM) with side-effects from running during the build process, potentially throwing an error.
-
-:::details Why?
-
-When importing your entrypoint to get its definition, the file is imported in a **_node environment_**, and doesn't have access to the `window`, `chrome`, or `browser` globals a web extension usually has access to. If WXT doesn't remove all the imports from the file, the imported modules could try and access one of these variables, throwing an error.
-
-:::
-
-:::warning
-See [`wxt-dev/wxt#336`](https://github.com/wxt-dev/wxt/issues/336) to track the status of this bug.
-:::
-
-Usually, this error occurs when you try to extract options into a shared file or try to run code outside the `main` function. To fix the example from above, use literal values when defining an entrypoint instead of importing them:
-
-```ts
-import { GOOGLE_MATCHES } from '~/utils/match-patterns'; // [!code --]
-
-export default defineContentScript({
-  matches: GOOGLE_MATCHES, // [!code --]
-  matches: ['*//*.google.com/*'], // [!code ++]
-  main() {
-    // ...
-  },
-});
-```
@@ -1,38 +0,0 @@
-# ES Modules
-
-Configure entrypoints to use ESM at runtime.
-
-Currently, ESM entrypoints are opt-in, so you must configure each entrypoint with that in mind.
-
-## HTML Pages <Badge type="warning" text="≥0.0.1" />
-
-In general, you should always make HTML pages import ESM scripts, unless you need to support old browsers.
-
-To make a script ESM, add `type="module"`:
-
-<!-- prettier-ignore -->
-```html
-<script src="./main.ts"></script> <!-- [!code --] -->
-<script src="./main.ts" type="module"></script> <!-- [!code ++] -->
-```
-
-## Background <Badge type="warning" text="≥0.16.0" />
-
-In your background script, set `type: "module"`:
-
-```ts
-export default defineBackground({
-  type: 'module', // !code ++
-  main() {
-    // ...
-  },
-});
-```
-
-:::warning
-Only MV3 support ESM background scripts/service workers. When targeting MV2, the `type` option is ignored and the background is always bundled into a single file as IIFE.
-:::
-
-## Content Scripts
-
-Coming soon. Follow [Content Script ESM Support #357](https://github.com/wxt-dev/wxt/issues/357) for updates.
@@ -57,19 +57,21 @@ Here's a basic request/response example:
 // popup/main.ts
 const res = await browser.runtime.sendMessage('ping');

-console.log(res); // "pong"
+console.log('res'); // "pong"
 ```

 ```ts
 // background.ts
 export default defineBackground(() => {
-  browser.runtime.onMessage.addListener((message, sender, sendResponse) => {
-    console.log(message); // "ping"
+  browser.runtime.onMessage.addEventListener(
+    (message, sender, sendResponse) => {
+      console.log(message); // "ping"

-    // Wait 1 second and respond with "pong"
-    setTimeout(() => sendResponse('pong'), 1000);
-    return true;
-  });
+      // Wait 1 second and respond with "pong"
+      setTimeout(() => sendResponse('pong'), 1000);
+      return true;
+    },
+  );
 });
 ```

@@ -133,7 +133,7 @@ The dev command will build the extension for development, open the browser, and
 When running the dev command, WXT will make several changes to your `manifest.json` to improve your development experience:

 - If missing, add a background script/service worker to enable fast reloads
- Add several `permissions` and `host_permissions` to enable HMR and fast reloads
+- Add serveral `permissions` and `host_permissions` to enable HMR and fast reloads
 - Modify the CSP to allow connections with the dev server
 - Remove `content_scripts` and register them at runtime so they can be easily reloaded when you save a file

@@ -145,6 +145,5 @@ If you're an experienced web extension developer and think the dev manifest look
 You're ready to build your web extension!

 - Learn how to [add entrypoints](./entrypoints) like the popup, options page, or content scripts
- Configure your entrypoints to [use ESM](./esm) at runtime
 - [Configure WXT](./configuration) by creating a `wxt.config.ts` file
- Checkout [example projects](https://github.com/wxt-dev/wxt-examples) to see how to perform common tasks with WXT
+- Checkout [example projects](https://github.com/wxt-dev/wxt-examples) to see how to perfom common tasks with WXT
@@ -7,7 +7,7 @@ head:

 # Introduction

-WXT is a free and open source framework for building web extensions in an conventional, intuitive, and safe way **_for all browsers_**.
+WXT is a free and open source framework for building web extensions in an conventional, intuative, and safe way **_for all browsers_**.

 WXT is based of [Nuxt](https://nuxt.com), and aims to provide the same great DX with TypeScript, auto-imports, and an opinionated project structure.

@@ -15,12 +15,12 @@ WXT is based of [Nuxt](https://nuxt.com), and aims to provide the same great DX

 ## Conventions

-WXT is an opinionated framework. This helps keep projects consistent and easy to pick up.
+WXT is an optionated framework. This helps keep projects consistent and easy to pick up.

 - **Generated manifest**: Based on your project's file structure
 - **Entrypoint configuration**: Configure entrypoints from the same file they're declare in
 - **Type-safety is a priority**: Out-of-the-box TypeScript support with improved browser API typing
- **Simple output file structure**: Output file paths minimize the path at runtime
+- **Simple output file structure**: Ouptut file paths minimize the path at runtime

 ## Development

@@ -0,0 +1,159 @@
+---
+outline: deep
+---
+
+# Localization
+
+WXT includes a util, [`i18n`](/api/wxt/i18n/), that provides a type-safe feature-rich alternative to `browser.i18n.getMessage`.
+
+It is available automatically when you create a messages file under the `locales/` directory, and add a `default_locale` to the manifest:
+
+```
+<srcDir>
+└─ locales/
+   ├─ en.json
+   ├─ es.json5
+   ├─ fr.yml
+   ├─ de.yaml
+   └─ ...
+```
+
+> You can use JSON, JSON5, or YAML formats.
+
+```ts
+// wxt.config.ts
+export default defineConfig({
+  manifest: {
+    default_locale: 'en',
+  },
+});
+```
+
+## Message File Format
+
+```yml
+# Use plain strings
+simpleMessage: Hello world!
+
+# Nest strings in objects
+popup:
+  overview:
+    title: Nested text
+
+# Plural form support
+items:
+  1: 1 item
+  n: $1 items
+# Optionally include a custom string for 0
+cartSize:
+  0: Empty
+  1: 1 item
+  n: $1 items
+
+# Or stick with the standard web extension format (with a message, description, and placeholders)
+manifestMessage:
+  message: $THIS$ is translated
+  description: This is not-translated, helps translators
+  placeholder:
+    this:
+      content: This
+```
+
+:::tip
+`locales/<code>.json` is 100% compatible with the standard web extension localization format (`_locales/<code>/messages.json`). If you have existing messages files, just move them into the `locales/` directory.
+:::
+
+## Usage
+
+`i18n` is auto-imported, but can be manually imported from `wxt/i18n`.
+
+```ts
+import { i18n } from 'wxt/i18n';
+```
+
+### Basic Usage
+
+You can access messages by their name:
+
+```yml
+helloWorld: Hello world!
+```
+
+```ts
+i18n.t('helloWorld'); // "Hello world!"
+```
+
+Nested messages are combined into one string using an `_`.
+
+```yml
+popup:
+  overview:
+    title: Hello world!
+```
+
+```ts
+i18n.t('popup_overview_title'); // "Hello world!"
+```
+
+If a message is in the standard web extension format, don't include a `_message`, even if it's nested.
+
+```yml
+helloWorld:
+  message: Hello world!
+  description: Some description
+popup:
+  overview:
+    title:
+      message: Nested Title
+```
+
+```ts
+i18n.t('helloWorld'); // "Hello world!"
+i18n.t('popup_overview_title'); // "Nested Title"
+```
+
+### Substitutions
+
+To insert a custom string into a translation, pass an array of values as the second parameter of the `i18n.t` function:
+
+```yml
+hello: Hello, $1, my name is $2.
+```
+
+```ts
+i18n.t('hello', ['Aaron', 'Mark']); // "Hello Aaron, my name is Mark."
+```
+
+### Plural Form
+
+When getting the translation for text with a plural form, use the `i18n.tp` function.
+
+```yml
+friends:
+  0: I have no friends.
+  1: I have a friend.
+  n: I have many friends.
+```
+
+```ts
+i18n.tp('friends', 0); // "I have no friends."
+i18n.tp('friends', 1); // "I have one friend."
+i18n.tp('friends', 2); // "I have many friends."
+```
+
+The first number is the `count`. It is what decides which form will be used.
+
+Substitutions are not required. But usually, a plural form will look something like this:
+
+```yml
+items:
+  1: 1 item
+  n: $1 items
+```
+
+```ts
+i18n.tp('items', 0, ['0']); // "0 items"
+i18n.tp('items', 1, ['1']); // "1 item"
+i18n.tp('items', 2, ['2']); // "2 items"
+i18n.tp('items', 3, ['3']); // "3 items"
+```
@@ -32,7 +32,7 @@ Every project is different, so there's no one-solution-fits-all to migrating you

 ## Popular Tools/Frameworks

-Here's specific steps for other popular frameworks/build tools.
+Here's specific steps for other popuplar frameworks/build tools.

 ### `vite-plugin-web-extension`

@@ -1,6 +1,6 @@
 # Multiple Browsers

-You can build an extension for any combination of browser and manifest version. Different browsers and manifest versions support different APIs and entrypoints, so be sure to check that your extension functions as expected for each target.
+You can build an extension for any combination of browser and manifest verison. Different browsers and manifest versions support different APIs and entrypoints, so be sure to check that your extension functions as expected for each target.

 Separate build targets are written to their own output directories:

@@ -17,9 +17,11 @@ Separate build targets are written to their own output directories:

 To build for a specific browser, pass the `-b --browser` flag from the CLI:

-```sh
+```
+
 wxt --browser firefox
 wxt build --browser firefox
+
 ```

 By default, it will build for `chrome`. When excluding the [manifest version flags](#target-manifest-version), it will default to the commonly accepted manifest version for that browser.
@@ -45,7 +47,7 @@ wxt --mv2
 wxt build --mv2
 ```

-When the `-b --browser` flag is not passed, it defaults to `chrome`. So here, we're targeting MV2 for Chrome.
+When the `-b --browser` flag is not passed, it defaults to `chrome`. So here, we're targetting MV2 for Chrome.

 ## Customizing Entrypoints

@@ -110,24 +112,3 @@ export default defineContentScript({
 :::warning
 Only `defineBackground` and `defineContentScript` support per-browser options right now.
 :::
-
-## Runtime
-
-To determine the browser or manifest version at runtime, you can use any of the below variables:
-
- `import.meta.env.BROWSER`: A string, the target browser, usually equal to the `--browser` flag
- `import.meta.env.MANIFEST_VERSION`: A number, either `2` or `3`, depending on the manifest version targeted
- `import.meta.env.CHROME`: A boolean equivalent to `import.meta.env.BROWSER === "chrome"`
- `import.meta.env.FIREFOX`: A boolean equivalent to `import.meta.env.BROWSER === "firefox"`
- `import.meta.env.EDGE`: A boolean equivalent to `import.meta.env.BROWSER === "edge"`
- `import.meta.env.SAFARI`: A boolean equivalent to `import.meta.env.BROWSER === "safari"`
- `import.meta.env.OPERA`: A boolean equivalent to `import.meta.env.BROWSER === "opera"`
- `import.meta.env.COMMAND`: A string, `"serve"` when running `wxt` for development or `"build"` in all other cases.
-
-:::info
-These variables are constants defined at build time based on the build target. They do not actually detect which browser the code is running in.
-
-For example, if you build for `--browser chrome` and publish it on Edge, `import.meta.env.BROWSER` will be `"chrome"`, not `"edge"`. You have to build a separate ZIP for `--browser edge` before `import.meta.env.BROWSER` will be `"edge"`.
-
-If you need to know the actual browser your code is being ran on, you should use a [user agent parser](https://www.npmjs.com/package/ua-parser-js).
-:::
@@ -1,80 +1,106 @@
---
-outline: deep
---
-
 # Publishing

-WXT will help you ZIP your extensions and submit them to the stores for review.
+WXT offers several utilities that simplify the publishing process.

 ## First Time Publishing

-If you're publishing an extension to a store for the first time, you must manually navigate the process. WXT doesn't help you create listings, each store has unique steps and requirements that you need to familiarize yourself with.
+If you're publishing an extension to a store for the first time, you must manually navigate the process. Each store has unique steps and requirements that you need to familiarize yourself with.

-For specific details about each store, see the stores sections below.
-
- [Chrome Web Store](#chrome-web-store)
- [Firefox Addon Store](#firefox-addon-store)
- [Edge Addons](#edge-addons)
-
-## Automation
-
-WXT provides two commands to help automate the release process:
-
- `wxt submit`: Submit new versions of your extension for review (and publish them automatically once approved)
- `wxt submit init`: Help setup all the required secrets and options for the `wxt submit` command
-
-To get started, run `wxt submit init` and follow the prompts. Once finished, you should have a `.env.submit` file! WXT will use this file to submit your updates.
-
-> In CI, make sure you add all the environment variables to the submit step.
-
-To release an update, build all the ZIPs you plan on releasing:
+Each store requires that a ZIP file be uploaded. You can generate these using the `wxt zip` command:

 ```sh
 wxt zip
 wxt zip -b firefox
+# etc
 ```

-Then run the `wxt submit` command, passing in all the ZIP files you want to release. In this case, we'll do a release for all 3 major stores: Chrome Web Store, Edge Addons, and Firefox Addons Store.
+Generated ZIP files are stored in the `.output` directory.

-If it's your first time running the command, you'll want to test your secrets by passing the `--dry-run` flag:
+## Automation

-```sh
-wxt submit --dry-run \
-  --chrome-zip .output/<your-extension>-<version>-chrome.zip \
-  --firefox-zip .output/<your-extension>-<version>-firefox.zip --firefox-sources-zip .output/<your-extension>-<version>-sources.zip \
-  --edge-zip .output/<your-extension>-<version>-chrome.zip
-```
+To automate releasing updates, use the [`publish-browser-extension`](https://www.npmjs.com/package/publish-browser-extension) package.

-If the dry run passes, remove the flag and do the actual release:
-
-```sh
-wxt submit \
-  --chrome-zip .output/<your-extension>-<version>-chrome.zip \
-  --firefox-zip .output/<your-extension>-<version>-firefox.zip --firefox-sources-zip .output/<your-extension>-<version>-sources.zip \
-  --edge-zip .output/<your-extension>-<version>-chrome.zip
-```
-
-:::tip
-If you only need to release to a single store, only pass that store's ZIP flag.
+:::info
+🚧 WXT plans to eventually incorporate the `publish-browser-extension` package into its own `wxt submit` command.
 :::

-:::tip
-See the [Firefox Addon Store](#firefox-addon-store) section for more details about the `--firefox-sources-zip` option.
-:::
+1. Install the necessary dependencies:
+
+   ```sh
+   pnpm add -D publish-browser-extension env-cmd
+   ```
+
+2. Add scripts to your `package.json` file:
+
+   ```json
+   {
+     "scripts": {
+       "submit": "env-cmd -f .env.submit -- publish-extension",
+       "submit:dry": "env-cmd -f .env.submit -- publish-extension --dry-run"
+     }
+   }
+   ```
+
+3. Create a `.env.submit` file and include the code below. If you're not publishing to certain stores, simply ignore their respective variables.
+
+   ```txt
+   CHROME_EXTENSION_ID=""
+   CHROME_CLIENT_ID=""
+   CHROME_CLIENT_SECRET=""
+   CHROME_REFRESH_TOKEN=""
+
+   FIREFOX_EXTENSION_ID=""
+   FIREFOX_JWT_ISSUER=""
+   FIREFOX_JWT_SECRET=""
+
+   EDGE_PRODUCT_ID=""
+   EDGE_CLIENT_ID=""
+   EDGE_CLIENT_SECRET=""
+   EDGE_ACCESS_TOKEN_URL=""
+   ```
+
+   > Each value will be filled in during the next step.
+
+4. Run `npx publish-extension --help` for assistance with filling out all the values. Insert the obtained values within the double quotes.
+
+5. ZIP all the targets you plan to publish, in this case Chrome and Firefox.
+
+   ```sh
+   wxt zip
+   wxt zip -b firefox
+   ```
+
+6. Test your credentials by running the `submit:dry` command:
+
+   ```sh
+   pnpm submit:dry \
+     --chrome-zip .output/your-extension-X.Y.Z-chrome.zip \
+     --firefox-zip .output/your-extension-X.Y.Z-firefox.zip \
+     --firefox-sources-zip .output/your-extension-X.Y.Z-sources.zip \
+     --edge-zip .output/your-extension-X.Y.Z-chrome.zip
+   ```
+
+7. Upload and submit your extension for review:
+
+   ```sh
+   pnpm submit \
+     --chrome-zip .output/your-extension-X.Y.Z-chrome.zip \
+     --firefox-zip .output/your-extension-X.Y.Z-firefox.zip \
+     --firefox-sources-zip .output/your-extension-X.Y.Z-sources.zip \
+     --edge-zip .output/your-extension-X.Y.Z-chrome.zip
+   ```

 ## GitHub Action

-Here's an example of a GitHub Action to automate submitting new versions of your extension for review. Ensure that you've added all required secrets used in the workflow to the repo's settings.
+Here's an example of a GitHub Action to automate submiting new versions of your extension for review. Ensure that you've added all required secrets used in the workflow to the repo's settings.

 ```yml
 # TODO
 ```

-## Stores
+## Chrome Web Store

-### Chrome Web Store
-
-> ✅ Supported &bull; [Developer Dashboard](https://chrome.google.com/webstore/developer/dashboard) &bull; [Publishing Docs](https://developer.chrome.com/docs/webstore/publish/)
+✅ Automated &bull; [Developer Dashboard](https://chrome.google.com/webstore/developer/dashboard) &bull; [Publishing Docs](https://developer.chrome.com/docs/webstore/publish/)

 To create a ZIP for Chrome:

@@ -82,15 +108,15 @@ To create a ZIP for Chrome:
 wxt zip
 ```

-### Firefox Addon Store
+## Firefox Addon Store

-> ✅ Supported &bull; [Developer Dashboard](https://addons.mozilla.org/developers/) &bull; [Publishing Docs](https://extensionworkshop.com/documentation/publish/submitting-an-add-on/)
+✅ Automated &bull; [Developer Dashboard](https://addons.mozilla.org/developers/) &bull; [Publishing Docs](https://extensionworkshop.com/documentation/publish/submitting-an-add-on/)

 Firefox requires you to upload a ZIP of your source code. This allows them to rebuild your extension and review the code in a readable way. More details can be found in [Firefox's docs](https://extensionworkshop.com/documentation/publish/source-code-submission/).

-WXT fully supports generating and automatically submitting a source code ZIP.
+WXT and `publish-browser-extension` both fully support generating and automatically submitting a source code ZIP.

-When you run `wxt zip -b firefox`, your sources are zipped into the `.output` directory alongside the extension. WXT will automatically exclude certain files such as config files, hidden files, and tests. However, it's important to manually check the ZIP to ensure it only contains the files necessary to rebuild your extension.
+When you run `wxt zip -b firefox`, your sources are zipped into the `.output` directory along with your built extension. WXT is configured to exclude certain files such as config files, hidden files, and tests. However, it's important to manually check the ZIP to ensure it only contains the files necessary to rebuild your extension.

 To customize which files are zipped, add the `zip` option to your config file.

@@ -126,34 +152,22 @@ yarn zip:firefox

 :::

-Make sure the build output is the exact same when running `wxt build -b firefox` in your main project and inside the zipped sources.
-
-:::warning
-If you use a `.env` files, they can effect the chunk hashes in the output directory. Either delete the .env file before running `wxt zip -b firefox`, or include it in your sources zip with the [`zip.includeSources`](/api/wxt/interfaces/InlineConfig#includesources) option. Be careful to not include any secrets in your `.env` files.
-
-See Issue [#377](https://github.com/wxt-dev/wxt/issues/377) for more details.
-:::
-
 Ensure that you have a `README.md` or `SOURCE_CODE_REVIEW.md` file with the above commands so that the Firefox team knows how to build your extension.

-### Safari
+## Safari

-> 🚧 Not supported yet
+🚧 Not automated at this time

-WXT does not currently support automated publishing for Safari. Safari extensions require a native MacOS or iOS app wrapper, which WXT does not create yet. For now, if you want to publish to Safari, follow this guide:
+:::warning
+🚧 WXT does not currently support automated publishing for Safari. Safari extensions require a native MacOS or iOS app wrapper, which WXT cannot create at this time. For now, if you want to publish to Safari, follow this guide:

- [Converting a web extension for Safari](https://developer.apple.com/documentation/safariservices/safari_web_extensions/converting_a_web_extension_for_safari) - "Convert your existing extension to a Safari web extension using Xcode’s command-line tool."
+https://developer.apple.com/documentation/safariservices/safari_web_extensions/distributing_your_safari_web_extension

-When running the `safari-web-extension-converter` CLI tool, pass the `.output/safari-mv2` or `.output/safari-mv3` directory, not your source code directory.
+:::

-```sh
-pnpm wxt build -b safari
-xcrun safari-web-extension-converter .output/safari-mv2
-```
+## Edge Addons

-### Edge Addons
-
-> ✅ Supported &bull; [Developer Dashboard](https://aka.ms/PartnerCenterLogin) &bull; [Publishing Docs](https://learn.microsoft.com/en-us/microsoft-edge/extensions-chromium/publish/publish-extension)
+✅ Automated &bull; [Developer Dashboard](https://aka.ms/PartnerCenterLogin) &bull; [Publishing Docs](https://learn.microsoft.com/en-us/microsoft-edge/extensions-chromium/publish/publish-extension)

 No need to create a specific ZIP for Edge. If you're already publishing to the Chrome Web Store, you can reuse your Chrome ZIP.

@@ -1,7 +1,3 @@
---
-outline: deep
---
-
 # Storage API

 WXT provides a simplified API to replace the `browser.storage.*` APIs. Use the `storage` auto-import from `wxt/storage` or import it manually to get started:
@@ -39,8 +35,6 @@ await storage.watch<number>(
 await storage.getMeta<{ v: number }>('local:installDate');
 ```

-For a full list of methods available, see the [API reference](/api/wxt/storage/interfaces/WxtStorage).
-
 ## Watchers

 To listen for storage changes, use the `storage.watch` function. It lets you setup a listener for a single key:
@@ -64,7 +58,7 @@ unwatch();

 `wxt/storage` also supports setting metadata for keys, stored at `key + "$"`. Metadata is a collection of properties associated with a key. It might be a version number, last modified date, etc.

-[Other than versioning](#versioning), you are responsible for managing a field's metadata:
+[Other than versioning](#versioning-and-migrations), you are responsible for managing a field's metadata:

 ```ts
 await Promise.all([
@@ -122,9 +116,7 @@ const unwatch = showChangelogOnUpdate.watch(() => {
 });
 ```

-For a full list of properties and methods available, see the [API reference](/api/wxt/storage/interfaces/WxtStorageItem).
-
-### Versioning
+### Versioning and Migrations

 You can add versioning to storage items if you expect them to grow or change over time. When defining the first version of an item, start with version 1.

@@ -260,30 +252,3 @@ export const ignoredWebsites = storage.defineItem<IgnoredWebsiteV2[]>( // [!code
 ```

 :::
-
-### Running Migrations
-
-To run migrations, you have two options:
-
-1. Import all versioned storage items into your background script and they will run automatically whenever your extension updates
-2. Manually call `item.migrate()`
-
-The first approach is recommended. To make importing all your storage items easy, you can define all of them in a single file, `utils/storage.ts`, and import that file into your background entrypoint:
-
-```ts
-// utils/storage.ts
-export countStorage = storage.defineItem(...);
-export themeStorage = storage.defineItem(...);
-export someOtherStorage = storage.defineItem(...);
-```
-
-```ts
-// entrypoints/background.ts
-import '@/utils/storage'; // This import runs migrations on updates
-
-export default defineBackground({
-  // ...
-});
-```
-
-> When you call `storage.defineItem`, a `browser.runtime.onInstalled` listener is added. `onInstalled` listeners are only triggered in the background, which is why you must import them into the background.
@@ -19,7 +19,7 @@ If you want to try to use a different framework for unit tests, you will need to
 - **Auto-imports**: Add `unimport` to your test environment or disable them by setting `imports: false` in your `wxt.config.ts` file
 - **`browser` mock**: Mock the `webextension-polyfill` module globally with `wxt/dist/virtual/mock-browser.js`
 - **[Remote Code Bundling](/guide/remote-code)**: If you use it, configure your environment to handle the `url:` module prefix
- **Global Variables**: If you consume them, manually define globals provided by WXT (like `import.meta.env.BROWSER`) by adding them to the global scope before accessing them (`import.meta.env.BROWSER = "chrome"`)
+- **Global Variables**: If you consume them, manually define globals provided by WXT (like `__BROWSER__`) by adding them to the global scope before accessing them (`globalThis.__BROWSER__ = "chrome"`)
 - **Import paths**: If you use the `@/` or `~/` path aliases, add them to your test environment

 [Here's how Vitest is configured](https://github.com/wxt-dev/wxt/blob/main/src/testing/wxt-vitest-plugin.ts) for reference.
@@ -6,7 +6,7 @@ title: Next-gen Web Extension Framework
 hero:
  name: WXT
  text: Next-gen Web Extension Framework
-  tagline: An open source tool that makes Chrome Extension development faster than ever before.
+  tagline: An open source tool that makes Chrome Extension devlopment faster than ever before.
  image:
    src: /hero-logo.svg
    alt: WXT
@@ -47,9 +47,11 @@ features:
    details: Nuxt-like auto-imports to speed up development.
    link: /guide/auto-imports
    linkText: Read docs
-  - icon: 🤖
-    title: Automated Publishing
-    details: Automatically zip, upload, submit, and publish extensions.
+  - icon: ⬇️
+    title: Bundle Remote Code
+    details: Downloads and bundles remote code imported from URLs.
+    link: /guide/remote-code
+    linkText: Read docs
  - icon: 🎨
    title: Frontend Framework Agnostic
    details: Works with any front-end framework with a Vite plugin.
@@ -62,12 +64,10 @@ features:
    linkText: See templates
  - icon: 📏
    title: Bundle Analysis
-    details: Tools for analyzing the final extension bundle and minimizing your extension's size.
-  - icon: ⬇️
-    title: Bundle Remote Code
-    details: Downloads and bundles remote code imported from URLs.
-    link: /guide/remote-code
-    linkText: Read docs
+    details: Tools for analyizing the final extension bundle and minimizing your extension's size.
+  - icon: 🤖
+    title: Automated Publishing
+    details: 'Coming soon. Automatically zip, upload, and release extensions.'
 ---

 <section class="vp-doc">
@@ -5,7 +5,8 @@
    "../src/browser.ts",
    "../src/sandbox",
    "../src/storage.ts",
-    "../src/testing"
+    "../src/testing",
+    "../src/i18n"
  ],
  "plugin": ["typedoc-plugin-markdown", "typedoc-vitepress-theme"],
  "out": "./api",
@@ -1,92 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest';
-import { TestProject } from '../utils';
-import { resetBundleIncrement } from '~/core/builders/vite/plugins';
-
-describe('Analysis', () => {
-  beforeEach(() => {
-    resetBundleIncrement();
-  });
-
-  it('should output a stats.html with no part files by default', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html');
-    project.addFile('entrypoints/options.html');
-    project.addFile(
-      'entrypoints/background.ts',
-      'export default defineBackground(() => {});',
-    );
-
-    await project.build({
-      analysis: {
-        enabled: true,
-      },
-    });
-
-    expect(await project.fileExists('stats.html')).toBe(true);
-    expect(await project.fileExists('.output/chrome-mv3/stats-0.json')).toBe(
-      false,
-    );
-  });
-
-  it('should save part files when requested', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html');
-    project.addFile('entrypoints/options.html');
-    project.addFile(
-      'entrypoints/background.ts',
-      'export default defineBackground(() => {});',
-    );
-
-    await project.build({
-      analysis: {
-        enabled: true,
-        keepArtifacts: true,
-      },
-    });
-
-    expect(await project.fileExists('stats.html')).toBe(true);
-    expect(await project.fileExists('stats-0.json')).toBe(true);
-    expect(await project.fileExists('stats-1.json')).toBe(true);
-  });
-
-  it('should support customizing the stats output directory', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html');
-    project.addFile('entrypoints/options.html');
-    project.addFile(
-      'entrypoints/background.ts',
-      'export default defineBackground(() => {});',
-    );
-
-    await project.build({
-      analysis: {
-        enabled: true,
-        outputFile: 'stats/bundle.html',
-      },
-    });
-
-    expect(await project.fileExists('stats/bundle.html')).toBe(true);
-  });
-
-  it('should place artifacts next to the custom output file', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html');
-    project.addFile('entrypoints/options.html');
-    project.addFile(
-      'entrypoints/background.ts',
-      'export default defineBackground(() => {});',
-    );
-
-    await project.build({
-      analysis: {
-        enabled: true,
-        outputFile: 'stats/bundle.html',
-        keepArtifacts: true,
-      },
-    });
-
-    expect(await project.fileExists('stats/bundle.html')).toBe(true);
-    expect(await project.fileExists('stats/bundle-0.json')).toBe(true);
-    expect(await project.fileExists('stats/bundle-1.json')).toBe(true);
-  });
-});
@@ -7,7 +7,7 @@ describe('Auto Imports', () => {
      const project = new TestProject();
      project.addFile('entrypoints/popup.html', `<html></html>`);

-      await project.prepare();
+      await project.build();

      expect(await project.serializeFile('.wxt/types/imports.d.ts'))
        .toMatchInlineSnapshot(`
@@ -38,7 +38,7 @@ describe('Auto Imports', () => {
      const project = new TestProject();
      project.addFile('entrypoints/popup.html', `<html></html>`);

-      await project.prepare();
+      await project.build();

      expect(await project.serializeFile('.wxt/wxt.d.ts'))
        .toMatchInlineSnapshot(`
@@ -63,7 +63,7 @@ describe('Auto Imports', () => {
      });
      project.addFile('entrypoints/popup.html', `<html></html>`);

-      await project.prepare();
+      await project.build();

      expect(await project.fileExists('.wxt/types/imports.d.ts')).toBe(false);
    });
@@ -75,7 +75,7 @@ describe('Auto Imports', () => {
      });
      project.addFile('entrypoints/popup.html', `<html></html>`);

-      await project.prepare();
+      await project.build();

      expect(
        await project.serializeFile('.wxt/wxt.d.ts'),
@@ -93,82 +93,4 @@ describe('Auto Imports', () => {
      );
    });
  });
-
-  describe('eslintrc', () => {
-    it('should output the globals list for ESLint to consume', async () => {
-      const project = new TestProject();
-      project.addFile('entrypoints/popup.html', `<html></html>`);
-
-      await project.prepare({
-        imports: {
-          eslintrc: {
-            enabled: true,
-          },
-        },
-      });
-
-      expect(await project.serializeFile('.wxt/eslintrc-auto-import.json'))
-        .toMatchInlineSnapshot(`
-          ".wxt/eslintrc-auto-import.json
-          ----------------------------------------
-          {
-            "globals": {
-              "ContentScriptContext": true,
-              "InvalidMatchPattern": true,
-              "MatchPattern": true,
-              "browser": true,
-              "createIframeUi": true,
-              "createIntegratedUi": true,
-              "createShadowRootUi": true,
-              "defineBackground": true,
-              "defineConfig": true,
-              "defineContentScript": true,
-              "defineUnlistedScript": true,
-              "fakeBrowser": true,
-              "storage": true
-            }
-          }
-          "
-        `);
-    });
-
-    it('should allow customizing the output', async () => {
-      const project = new TestProject();
-      project.addFile('entrypoints/popup.html', `<html></html>`);
-
-      await project.prepare({
-        imports: {
-          eslintrc: {
-            enabled: true,
-            filePath: project.resolvePath('example.json'),
-            globalsPropValue: 'readonly',
-          },
-        },
-      });
-
-      expect(await project.serializeFile('example.json'))
-        .toMatchInlineSnapshot(`
-          "example.json
-          ----------------------------------------
-          {
-            "globals": {
-              "ContentScriptContext": "readonly",
-              "InvalidMatchPattern": "readonly",
-              "MatchPattern": "readonly",
-              "browser": "readonly",
-              "createIframeUi": "readonly",
-              "createIntegratedUi": "readonly",
-              "createShadowRootUi": "readonly",
-              "defineBackground": "readonly",
-              "defineConfig": "readonly",
-              "defineContentScript": "readonly",
-              "defineUnlistedScript": "readonly",
-              "fakeBrowser": "readonly",
-              "storage": "readonly"
-            }
-          }
-          "
-        `);
-    });
-  });
 });
@@ -1,99 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { TestProject } from '../utils';
-import { WxtHooks } from '~/types';
-
-const hooks: WxtHooks = {
-  ready: vi.fn(),
-  'build:before': vi.fn(),
-  'build:done': vi.fn(),
-  'build:manifestGenerated': vi.fn(),
-  'entrypoints:resolved': vi.fn(),
-  'entrypoints:grouped': vi.fn(),
-};
-
-function expectHooksToBeCalled(called: Record<keyof WxtHooks, boolean>) {
-  Object.keys(hooks).forEach((key) => {
-    const hookName = key as keyof WxtHooks;
-    const times = called[hookName] ? 1 : 0;
-    expect(
-      hooks[hookName],
-      `Expected "${hookName}" to be called ${times} time(s)`,
-    ).toBeCalledTimes(called[hookName] ? 1 : 0);
-  });
-}
-
-describe('Hooks', () => {
-  beforeEach(() => {
-    Object.values(hooks).forEach((fn) => fn.mockReset());
-  });
-
-  it('prepare should call hooks', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html', '<html></html>');
-
-    await project.prepare({ hooks });
-
-    expectHooksToBeCalled({
-      ready: true,
-      'build:before': false,
-      'build:done': false,
-      'build:manifestGenerated': false,
-      'entrypoints:grouped': false,
-      'entrypoints:resolved': true,
-    });
-  });
-
-  it('build should call hooks', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html', '<html></html>');
-
-    await project.build({ hooks });
-
-    expectHooksToBeCalled({
-      ready: true,
-      'build:before': true,
-      'build:done': true,
-      'build:manifestGenerated': true,
-      'entrypoints:grouped': true,
-      'entrypoints:resolved': true,
-    });
-  });
-
-  it('zip should call hooks', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html', '<html></html>');
-
-    await project.zip({ hooks });
-
-    expectHooksToBeCalled({
-      ready: true,
-      'build:before': true,
-      'build:done': true,
-      'build:manifestGenerated': true,
-      'entrypoints:grouped': true,
-      'entrypoints:resolved': true,
-    });
-  });
-
-  it('server.start should call hooks', async () => {
-    const project = new TestProject();
-    project.addFile('entrypoints/popup.html', '<html></html>');
-
-    const server = await project.startServer({
-      hooks,
-      runner: {
-        disabled: true,
-      },
-    });
-    await server.stop();
-
-    expectHooksToBeCalled({
-      ready: true,
-      'build:before': true,
-      'build:done': true,
-      'build:manifestGenerated': true,
-      'entrypoints:grouped': true,
-      'entrypoints:resolved': true,
-    });
-  });
-});
@@ -227,169 +227,4 @@ describe('Output Directory Structure', () => {
      true,
    );
  });
-
-  it('should generate ESM background script when type=module', async () => {
-    const project = new TestProject();
-    project.addFile(
-      'utils/log.ts',
-      `export function logHello(name: string) {
-        console.log(\`Hello \${name}!\`);
-      }`,
-    );
-    project.addFile(
-      'entrypoints/background.ts',
-      `export default defineBackground({
-        type: "module",
-        main() {
-          logHello("background");
-        },
-      })`,
-    );
-    project.addFile(
-      'entrypoints/popup/index.html',
-      `<html>
-        <head>
-          <script type="module" src="./main.ts"></script>
-        </head>
-      </html>`,
-    );
-    project.addFile('entrypoints/popup/main.ts', `logHello('popup')`);
-
-    await project.build({
-      experimental: {
-        // Simplify the build output for comparison
-        includeBrowserPolyfill: false,
-      },
-      vite: () => ({
-        build: {
-          // Make output for snapshot readible
-          minify: false,
-        },
-      }),
-    });
-
-    expect(await project.serializeFile('.output/chrome-mv3/background.js'))
-      .toMatchInlineSnapshot(`
-        ".output/chrome-mv3/background.js
-        ----------------------------------------
-        import { l as logHello } from "./chunks/log-bezs0tt4.js";
-        function defineBackground(arg) {
-          if (typeof arg === "function")
-            return { main: arg };
-          return arg;
-        }
-        const definition = defineBackground({
-          type: "module",
-          main() {
-            logHello("background");
-          }
-        });
-        chrome;
-        function print(method, ...args) {
-          return;
-        }
-        var logger = {
-          debug: (...args) => print(console.debug, ...args),
-          log: (...args) => print(console.log, ...args),
-          warn: (...args) => print(console.warn, ...args),
-          error: (...args) => print(console.error, ...args)
-        };
-        try {
-          const res = definition.main();
-          if (res instanceof Promise) {
-            console.warn(
-              "The background's main() function return a promise, but it must be synchronous"
-            );
-          }
-        } catch (err) {
-          logger.error("The background crashed on startup!");
-          throw err;
-        }
-        "
-      `);
-  });
-
-  it('should generate IIFE background script when type=undefined', async () => {
-    const project = new TestProject();
-    project.addFile(
-      'utils/log.ts',
-      `export function logHello(name: string) {
-          console.log(\`Hello \${name}!\`);
-        }`,
-    );
-    project.addFile(
-      'entrypoints/background.ts',
-      `export default defineBackground({
-          main() {
-            logHello("background");
-          },
-        })`,
-    );
-    project.addFile(
-      'entrypoints/popup/index.html',
-      `<html>
-          <head>
-            <script type="module" src="./main.ts"></script>
-          </head>
-        </html>`,
-    );
-    project.addFile('entrypoints/popup/main.ts', `logHello('popup')`);
-
-    await project.build({
-      experimental: {
-        // Simplify the build output for comparison
-        includeBrowserPolyfill: false,
-      },
-      vite: () => ({
-        build: {
-          // Make output for snapshot readible
-          minify: false,
-        },
-      }),
-    });
-
-    expect(await project.serializeFile('.output/chrome-mv3/background.js'))
-      .toMatchInlineSnapshot(`
-        ".output/chrome-mv3/background.js
-        ----------------------------------------
-        (function() {
-          "use strict";
-          function defineBackground(arg) {
-            if (typeof arg === "function")
-              return { main: arg };
-            return arg;
-          }
-          function logHello(name) {
-            console.log(\`Hello \${name}!\`);
-          }
-          const definition = defineBackground({
-            main() {
-              logHello("background");
-            }
-          });
-          chrome;
-          function print(method, ...args) {
-            return;
-          }
-          var logger = {
-            debug: (...args) => print(console.debug, ...args),
-            log: (...args) => print(console.log, ...args),
-            warn: (...args) => print(console.warn, ...args),
-            error: (...args) => print(console.error, ...args)
-          };
-          try {
-            const res = definition.main();
-            if (res instanceof Promise) {
-              console.warn(
-                "The background's main() function return a promise, but it must be synchronous"
-              );
-            }
-          } catch (err) {
-            logger.error("The background crashed on startup!");
-            throw err;
-          }
-        })();
-        "
-      `);
-  });
 });
@@ -6,7 +6,7 @@ describe('TypeScript Project', () => {
    const project = new TestProject();
    project.addFile('entrypoints/unlisted.html');

-    await project.prepare();
+    await project.build();

    const output = await project.serializeFile('.wxt/types/globals.d.ts');
    expect(output).toMatchInlineSnapshot(`
@@ -14,19 +14,16 @@ describe('TypeScript Project', () => {
      ----------------------------------------
      // Generated by wxt
      export {}
-      interface ImportMetaEnv {
-        readonly MANIFEST_VERSION: 2 | 3;
-        readonly BROWSER: string;
-        readonly CHROME: boolean;
-        readonly FIREFOX: boolean;
-        readonly SAFARI: boolean;
-        readonly EDGE: boolean;
-        readonly OPERA: boolean;
-        readonly COMMAND: "build" | "serve";
-        readonly ENTRYPOINT: string;
-      }
-      interface ImportMeta {
-        readonly env: ImportMetaEnv
+      declare global {
+        const __MANIFEST_VERSION__: 2 | 3;
+        const __BROWSER__: string;
+        const __IS_CHROME__: boolean;
+        const __IS_FIREFOX__: boolean;
+        const __IS_SAFARI__: boolean;
+        const __IS_EDGE__: boolean;
+        const __IS_OPERA__: boolean;
+        const __COMMAND__: "build" | "serve";
+        const __ENTRYPOINT__: string;
      }
      "
    `);
@@ -38,7 +35,7 @@ describe('TypeScript Project', () => {
    project.addFile('entrypoints/options.html');
    project.addFile('entrypoints/sandbox.html');

-    await project.prepare();
+    await project.build();

    const output = await project.serializeFile('.wxt/types/paths.d.ts');
    expect(output).toMatchInlineSnapshot(`
@@ -52,10 +49,8 @@ describe('TypeScript Project', () => {
          | "/options.html"
          | "/popup.html"
          | "/sandbox.html"
-        type HtmlPublicPath = Extract<PublicPath, \`\${string}.html\`>
        export interface WxtRuntime extends Runtime.Static {
          getURL(path: PublicPath): string;
-          getURL(path: \`\${HtmlPublicPath}\${string}\`): string;
        }
      }
      "
@@ -103,7 +98,7 @@ describe('TypeScript Project', () => {
      },
    });

-    await project.prepare();
+    await project.build();

    const output = await project.serializeFile('.wxt/types/i18n.d.ts');
    expect(output).toMatchInlineSnapshot(`
@@ -136,7 +131,7 @@ describe('TypeScript Project', () => {
            options?: GetMessageOptions,
          ): string;
          /**
-           * No message description.
+           * 
           *
           * "<browser.i18n.getUiLocale()>"
           */
@@ -225,7 +220,7 @@ describe('TypeScript Project', () => {
    const project = new TestProject();
    project.addFile('entrypoints/unlisted.html');

-    await project.prepare();
+    await project.build();

    const output = await project.serializeFile('.wxt/wxt.d.ts');
    expect(output).toMatchInlineSnapshot(`
@@ -245,7 +240,7 @@ describe('TypeScript Project', () => {
    const project = new TestProject();
    project.addFile('entrypoints/unlisted.html');

-    await project.prepare();
+    await project.build();

    const output = await project.serializeFile('.wxt/tsconfig.json');
    expect(output).toMatchInlineSnapshot(`
@@ -289,7 +284,7 @@ describe('TypeScript Project', () => {
      srcDir: 'src',
    });

-    await project.prepare();
+    await project.build();

    const output = await project.serializeFile('.wxt/tsconfig.json');
    expect(output).toMatchInlineSnapshot(`
@@ -337,7 +332,7 @@ describe('TypeScript Project', () => {
      },
    });

-    await project.prepare();
+    await project.build();

    const output = await project.serializeFile('.wxt/tsconfig.json');
    expect(output).toMatchInlineSnapshot(`
@@ -107,29 +107,4 @@ describe('User Config', () => {
    });
    expect(withoutPolyfill).not.toBe(withPolyfill);
  });
-
-  it('should respect changing config files', async () => {
-    const project = new TestProject();
-    project.addFile(
-      'src/entrypoints/background.ts',
-      `export default defineBackground(
-        () => console.log('Hello background'),
-      );`,
-    );
-    project.addFile(
-      'test.config.ts',
-      `import { defineConfig } from 'wxt';
-      
-      export default defineConfig({
-        outDir: ".custom-output",
-        srcDir: "src",
-      });`,
-    );
-
-    await project.build({ configFile: 'test.config.ts' });
-
-    expect(
-      await project.fileExists('.custom-output/chrome-mv3/background.js'),
-    ).toBe(true);
-  });
 });
@@ -2,14 +2,7 @@ import { dirname, join, relative, resolve } from 'path';
 import fs from 'fs-extra';
 import glob from 'fast-glob';
 import { execaCommand } from 'execa';
-import {
-  InlineConfig,
-  UserConfig,
-  build,
-  createServer,
-  prepare,
-  zip,
-} from '../src';
+import { InlineConfig, UserConfig, build } from '../src';
 import { normalizePath } from '../src/core/utils/paths';
 import merge from 'lodash.merge';

@@ -70,41 +63,15 @@ export class TestProject {
    if (filename === 'wxt.config.ts') this.config = {};
  }

-  async prepare(config: InlineConfig = {}) {
-    await this.writeProjectToDisk();
-    await prepare({ ...config, root: this.root });
-  }
-
-  async build(config: InlineConfig = {}) {
-    await this.writeProjectToDisk();
-    await build({ ...config, root: this.root });
-  }
-
-  async zip(config: InlineConfig = {}) {
-    await this.writeProjectToDisk();
-    await zip({ ...config, root: this.root });
-  }
-
-  async startServer(config: InlineConfig = {}) {
-    await this.writeProjectToDisk();
-    const server = await createServer({ ...config, root: this.root });
-    await server.start();
-    return server;
-  }
-
  /**
-   * Call `path.resolve` relative to the project's root directory.
+   * Write the files to the test directory install dependencies, and build the project.
   */
-  resolvePath(...path: string[]): string {
-    return resolve(this.root, ...path);
-  }
-
-  private async writeProjectToDisk() {
+  async build(config: InlineConfig = {}) {
    if (this.config == null) this.setConfigFileConfig();

    for (const file of this.files) {
      const [name, content] = file;
-      const filePath = this.resolvePath(name);
+      const filePath = resolve(this.root, name);
      const fileDir = dirname(filePath);
      await fs.ensureDir(fileDir);
      await fs.writeFile(filePath, content ?? '', 'utf-8');
@@ -113,6 +80,7 @@ export class TestProject {
    await execaCommand('pnpm --ignore-workspace i --ignore-scripts', {
      cwd: this.root,
    });
+    await build({ ...config, root: this.root });
  }

  /**
@@ -147,13 +115,13 @@ export class TestProject {
    ignoreContentsOfFilenames?: string[],
  ): Promise<string> {
    const outputFiles = await glob('**/*', {
-      cwd: this.resolvePath(dir),
+      cwd: resolve(this.root, dir),
      ignore: ['**/node_modules', '**/.output'],
    });
    outputFiles.sort();
    const fileContents = [];
    for (const file of outputFiles) {
-      const path = this.resolvePath(dir, file);
+      const path = resolve(this.root, dir, file);
      const isContentIgnored = !!ignoreContentsOfFilenames?.find(
        (ignoredFile) => normalizePath(path).endsWith(ignoredFile),
      );
@@ -163,12 +131,12 @@ export class TestProject {
  }

  /**
-   * @param path An absolute path to a file or a path relative to the root.
+   * @param path An abosolute path to a file or a path relative to the root.
   * @param ignoreContents An optional boolean that, when true, causes this function to not print
   *                       the file contents.
   */
  async serializeFile(path: string, ignoreContents?: boolean): Promise<string> {
-    const absolutePath = this.resolvePath(path);
+    const absolutePath = resolve(this.root, path);
    return [
      normalizePath(relative(this.root, absolutePath)),
      ignoreContents ? '<contents-ignored>' : await fs.readFile(absolutePath),
@@ -176,12 +144,12 @@ export class TestProject {
  }

  fileExists(path: string): Promise<boolean> {
-    return fs.exists(this.resolvePath(path));
+    return fs.exists(resolve(this.root, path));
  }

  async getOutputManifest(
    path: string = '.output/chrome-mv3/manifest.json',
  ): Promise<any> {
-    return await fs.readJson(this.resolvePath(path));
+    return await fs.readJson(resolve(this.root, path));
  }
 }
@@ -1,7 +1,7 @@
 {
  "name": "wxt",
  "type": "module",
-  "version": "0.17.1",
+  "version": "0.14.2-alpha1",
  "description": "Next gen framework for developing web extensions",
  "engines": {
    "node": ">=18",
@@ -77,12 +77,22 @@
        "default": "./dist/storage.cjs"
      }
    },
+    "./i18n": {
+      "import": {
+        "types": "./dist/i18n.d.ts",
+        "default": "./dist/i18n.js"
+      },
+      "require": {
+        "types": "./dist/i18n.d.cts",
+        "default": "./dist/i18n.cjs"
+      }
+    },
    "./vite-builder-env": {
      "types": "./dist/vite-builder-env.d.ts"
    }
  },
  "scripts": {
-    "wxt": "tsx src/cli/index.ts",
+    "wxt": "tsx src/cli.ts",
    "build": "tsx scripts/build.ts",
    "format": "prettier --write .",
    "format:check": "prettier --check .",
@@ -120,37 +130,34 @@
    "fs-extra": "^11.1.1",
    "get-port": "^7.0.0",
    "giget": "^1.1.3",
-    "hookable": "^5.5.3",
+    "immer": "^10.0.3",
    "is-wsl": "^3.0.0",
    "jiti": "^1.21.0",
    "json5": "^2.2.3",
    "linkedom": "^0.16.1",
-    "manage-path": "^2.0.0",
    "minimatch": "^9.0.3",
-    "natural-compare": "^1.4.0",
    "normalize-path": "^3.0.0",
    "ora": "^7.0.1",
    "picocolors": "^1.0.0",
    "prompts": "^2.4.2",
-    "publish-browser-extension": "^2.1.2",
    "rollup-plugin-visualizer": "^5.9.2",
    "unimport": "^3.4.0",
-    "vite": "^5.1.3",
-    "web-ext-run": "^0.2.0",
+    "vite": "^5.0.0",
+    "web-ext-run": "^0.1.0",
    "webextension-polyfill": "^0.10.0",
+    "yaml": "^2.3.4",
    "zip-dir": "^2.0.0"
  },
  "devDependencies": {
    "@faker-js/faker": "^8.3.1",
    "@types/fs-extra": "^11.0.4",
    "@types/lodash.merge": "^4.6.9",
-    "@types/natural-compare": "^1.4.3",
    "@types/node": "^20.10.3",
    "@types/normalize-path": "^3.0.2",
    "@types/prompts": "^2.4.9",
    "@vitest/coverage-v8": "^1.0.1",
    "execa": "^8.0.1",
-    "happy-dom": "^13.3.8",
+    "happy-dom": "^12.10.3",
    "lint-staged": "^15.2.0",
    "lodash.merge": "^4.6.2",
    "npm-run-all": "^4.1.5",
@@ -165,7 +172,7 @@
    "typedoc-vitepress-theme": "1.0.0-next.3",
    "typescript": "^5.3.2",
    "vitepress": "1.0.0-rc.34",
-    "vitest": "^1.2.2",
+    "vitest": "^1.1.0",
    "vitest-mock-extended": "^1.3.1",
    "vue": "^3.3.10"
  },
@@ -58,6 +58,7 @@ const config: tsup.Options[] = [
      index: 'src/index.ts',
      testing: 'src/testing/index.ts',
      storage: 'src/storage.ts',
+      i18n: 'src/i18n/index.ts',
    },
    format: ['cjs', 'esm'],
    clean: true,
@@ -94,14 +95,9 @@ const config: tsup.Options[] = [
  {
    ...preset,
    entry: {
-      cli: 'src/cli/index.ts',
+      cli: 'src/cli.ts',
    },
    format: ['esm'],
-    banner: {
-      // Fixes dynamic require of nodejs modules. See https://github.com/wxt-dev/wxt/issues/355
-      // https://github.com/evanw/esbuild/issues/1921#issuecomment-1152991694
-      js: "import { createRequire } from 'module';const require = createRequire(import.meta.url);",
-    },
  },
 ];

@@ -1,14 +1,7 @@
 import { fakeBrowser } from '@webext-core/fake-browser';
-import { describe, it, expect, beforeEach, vi, expectTypeOf } from 'vitest';
+import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { browser } from '~/browser';
-import { WxtStorageItem, storage } from '~/storage';
-
-async function triggerUpdate() {
-  await fakeBrowser.runtime.onInstalled.trigger({
-    reason: 'update',
-    temporary: false,
-  });
-}
+import { storage } from '~/storage';

 describe('Storage Utils', () => {
  beforeEach(() => {
@@ -391,466 +384,417 @@ describe('Storage Utils', () => {
          expect(cb).not.toBeCalled();
        });
      });
+
+      describe('defineItem', () => {
+        describe('versioning', () => {
+          /**
+           * This works because fakeBrowser is syncrounous, and is will finish any number of chained
+           * calls within a single tick of the event loop, ie: a timeout of 0.
+           */
+          async function waitForMigrations() {
+            return new Promise((res) => setTimeout(res));
+          }
+
+          it('should migrate values to the latest when a version upgrade is detected', async () => {
+            await fakeBrowser.storage[storageArea].set({
+              count: 2,
+              count$: { v: 1 },
+            });
+            const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
+            const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
+
+            const item = storage.defineItem<number, { v: number }>(
+              `${storageArea}:count`,
+              {
+                version: 3,
+                migrations: {
+                  2: migrateToV2,
+                  3: migrateToV3,
+                },
+              },
+            );
+            await waitForMigrations();
+
+            const actualValue = await item.getValue();
+            const actualMeta = await item.getMeta();
+
+            expect(actualValue).toEqual(12);
+            expect(actualMeta).toEqual({ v: 3 });
+
+            expect(migrateToV2).toBeCalledTimes(1);
+            expect(migrateToV2).toBeCalledWith(2);
+
+            expect(migrateToV3).toBeCalledTimes(1);
+            expect(migrateToV3).toBeCalledWith(4);
+          });
+
+          it("should not run migrations if the value doesn't exist yet", async () => {
+            const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
+            const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
+
+            const item = storage.defineItem<number, { v: number }>(
+              `${storageArea}:count`,
+              {
+                version: 3,
+                migrations: {
+                  2: migrateToV2,
+                  3: migrateToV3,
+                },
+              },
+            );
+            await waitForMigrations();
+
+            const actualValue = await item.getValue();
+            const actualMeta = await item.getMeta();
+
+            expect(actualValue).toBeNull();
+            expect(actualMeta).toEqual({});
+
+            expect(migrateToV2).not.toBeCalled();
+            expect(migrateToV3).not.toBeCalled();
+          });
+
+          it('should run the v2 migration when converting an unversioned item to a versioned one', async () => {
+            await fakeBrowser.storage[storageArea].set({
+              count: 2,
+            });
+            const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
+
+            const item = storage.defineItem<number, { v: number }>(
+              `${storageArea}:count`,
+              {
+                version: 2,
+                migrations: {
+                  2: migrateToV2,
+                },
+              },
+            );
+            await waitForMigrations();
+
+            const actualValue = await item.getValue();
+            const actualMeta = await item.getMeta();
+
+            expect(actualValue).toEqual(4);
+            expect(actualMeta).toEqual({ v: 2 });
+
+            expect(migrateToV2).toBeCalledTimes(1);
+            expect(migrateToV2).toBeCalledWith(2);
+          });
+
+          it('Should not run old migrations if the version is unchanged', async () => {
+            await fakeBrowser.storage[storageArea].set({
+              count: 2,
+              count$: { v: 3 },
+            });
+            const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
+            const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
+
+            storage.defineItem<number, { v: number }>(`${storageArea}:count`, {
+              version: 3,
+              migrations: {
+                2: migrateToV2,
+                3: migrateToV3,
+              },
+            });
+            await waitForMigrations();
+
+            expect(migrateToV2).not.toBeCalled();
+            expect(migrateToV3).not.toBeCalled();
+          });
+
+          it('should skip missing migration functions', async () => {
+            await fakeBrowser.storage[storageArea].set({
+              count: 2,
+              count$: { v: 0 },
+            });
+            const migrateToV1 = vi.fn((oldCount) => oldCount * 1);
+            const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
+
+            const item = storage.defineItem<number, { v: number }>(
+              `${storageArea}:count`,
+              {
+                version: 3,
+                migrations: {
+                  1: migrateToV1,
+                  3: migrateToV3,
+                },
+              },
+            );
+            await waitForMigrations();
+
+            const actualValue = await item.getValue();
+            const actualMeta = await item.getMeta();
+
+            expect(actualValue).toEqual(6);
+            expect(actualMeta).toEqual({ v: 3 });
+
+            expect(migrateToV1).toBeCalledTimes(1);
+            expect(migrateToV1).toBeCalledWith(2);
+
+            expect(migrateToV3).toBeCalledTimes(1);
+            expect(migrateToV3).toBeCalledWith(2);
+          });
+
+          it('should throw an error if the new version is less than the previous version', async () => {
+            const prevVersion = 2;
+            const nextVersion = 1;
+            await fakeBrowser.storage[storageArea].set({
+              count: 0,
+              count$: { v: prevVersion },
+            });
+
+            const item = storage.defineItem(`${storageArea}:count`, {
+              version: nextVersion,
+            });
+
+            // @ts-expect-error: _migrationsCompleted is returned, but untyped
+            await expect(item._migrationsCompleted).rejects.toThrow(
+              'version downgrade detected',
+            );
+          });
+        });
+
+        describe('getValue', () => {
+          it('should return the value from storage', async () => {
+            const expected = 2;
+            const item = storage.defineItem<number>(`${storageArea}:count`);
+            await fakeBrowser.storage[storageArea].set({ count: expected });
+
+            const actual = await item.getValue();
+
+            expect(actual).toBe(expected);
+          });
+
+          it('should return null if missing', async () => {
+            const item = storage.defineItem<number>(`${storageArea}:count`);
+
+            const actual = await item.getValue();
+
+            expect(actual).toBeNull();
+          });
+
+          it('should return the provided default value if missing', async () => {
+            const expected = 0;
+            const item = storage.defineItem(`${storageArea}:count`, {
+              defaultValue: expected,
+            });
+
+            const actual = await item.getValue();
+
+            expect(actual).toEqual(expected);
+          });
+        });
+
+        describe('getMeta', () => {
+          it('should return the value from storage at key+$', async () => {
+            const expected = { v: 2 };
+            const item = storage.defineItem<number, { v: number }>(
+              `${storageArea}:count`,
+            );
+            await fakeBrowser.storage[storageArea].set({ count$: expected });
+
+            const actual = await item.getMeta();
+
+            expect(actual).toBe(expected);
+          });
+
+          it('should return an empty object if missing', async () => {
+            const expected = {};
+            const item = storage.defineItem<number, { v: number }>(
+              `${storageArea}:count`,
+            );
+
+            const actual = await item.getMeta();
+
+            expect(actual).toEqual(expected);
+          });
+        });
+
+        describe('setValue', () => {
+          it('should set the value in storage', async () => {
+            const expected = 1;
+            const item = storage.defineItem<number>(`${storageArea}:count`);
+
+            await item.setValue(expected);
+            const actual = await item.getValue();
+
+            expect(actual).toBe(expected);
+          });
+
+          it.each([undefined, null])(
+            'should remove the value in storage when %s is passed in',
+            async (value) => {
+              const item = storage.defineItem<number>(`${storageArea}:count`);
+
+              // @ts-expect-error: undefined is not assignable to null, but we're testing that case on purpose
+              await item.setValue(value);
+              const actual = await item.getValue();
+
+              expect(actual).toBeNull();
+            },
+          );
+        });
+
+        describe('setMeta', () => {
+          it('should set metadata at key+$', async () => {
+            const expected = { date: Date.now() };
+            const item = storage.defineItem<number, { date: number }>(
+              `${storageArea}:count`,
+            );
+
+            await item.setMeta(expected);
+            const actual = await item.getMeta();
+
+            expect(actual).toEqual(expected);
+          });
+
+          it('should add to metadata if already present', async () => {
+            const existing = { v: 2 };
+            const newFields = { date: Date.now() };
+            const expected = { ...existing, ...newFields };
+            const item = storage.defineItem<
+              number,
+              { date: number; v: number }
+            >(`${storageArea}:count`);
+            await fakeBrowser.storage[storageArea].set({
+              count$: existing,
+            });
+
+            await item.setMeta(newFields);
+            const actual = await item.getMeta();
+
+            expect(actual).toEqual(expected);
+          });
+        });
+
+        describe('removeValue', () => {
+          it('should remove the key from storage', async () => {
+            const item = storage.defineItem(`${storageArea}:count`);
+            await fakeBrowser.storage[storageArea].set({ count: 456 });
+
+            await item.removeValue();
+            const actual = await item.getValue();
+
+            expect(actual).toBeNull();
+          });
+
+          it('should not remove the metadata by default', async () => {
+            const item = storage.defineItem(`${storageArea}:count`);
+            const expected = { v: 1 };
+            await fakeBrowser.storage[storageArea].set({
+              count$: expected,
+              count: 3,
+            });
+
+            await item.removeValue();
+            const actual = await item.getMeta();
+
+            expect(actual).toEqual(expected);
+          });
+
+          it('should remove the metadata when requested', async () => {
+            const item = storage.defineItem(`${storageArea}:count`);
+            await fakeBrowser.storage[storageArea].set({
+              count$: { v: 1 },
+              count: 3,
+            });
+
+            await item.removeValue({ removeMeta: true });
+            const actual = await item.getMeta();
+
+            expect(actual).toEqual({});
+          });
+        });
+
+        describe('removeMeta', () => {
+          it('should remove all metadata', async () => {
+            const item = storage.defineItem<number, { v: number }>(
+              `${storageArea}:count`,
+            );
+            await fakeBrowser.storage[storageArea].set({ count$: { v: 4 } });
+
+            await item.removeMeta();
+            const actual = await item.getMeta();
+
+            expect(actual).toEqual({});
+          });
+
+          it('should only remove specific properties', async () => {
+            const item = storage.defineItem<number, { v: number; d: number }>(
+              `${storageArea}:count`,
+            );
+            await fakeBrowser.storage[storageArea].set({
+              count$: { v: 4, d: Date.now() },
+            });
+
+            await item.removeMeta(['d']);
+            const actual = await item.getMeta();
+
+            expect(actual).toEqual({ v: 4 });
+          });
+        });
+
+        describe('watch', () => {
+          it("should not trigger if the changed key is different from the item's key", async () => {
+            const item = storage.defineItem(`${storageArea}:key`);
+            const cb = vi.fn();
+
+            item.watch(cb);
+            await storage.setItem(`${storageArea}:not-the-key`, '123');
+
+            expect(cb).not.toBeCalled();
+          });
+
+          it("should not trigger if the value doesn't change", async () => {
+            const item = storage.defineItem(`${storageArea}:key`);
+            const cb = vi.fn();
+            const value = '123';
+
+            await item.setValue(value);
+            item.watch(cb);
+            await item.setValue(value);
+
+            expect(cb).not.toBeCalled();
+          });
+
+          it('should call the callback when the value changes', async () => {
+            const item = storage.defineItem(`${storageArea}:key`);
+            const cb = vi.fn();
+            const newValue = '123';
+            const oldValue = null;
+
+            item.watch(cb);
+            await item.setValue(newValue);
+
+            expect(cb).toBeCalledTimes(1);
+            expect(cb).toBeCalledWith(newValue, oldValue);
+          });
+
+          it('should remove the listener when calling the returned function', async () => {
+            const item = storage.defineItem(`${storageArea}:key`);
+            const cb = vi.fn();
+
+            const unwatch = item.watch(cb);
+            unwatch();
+            await item.setValue('123');
+
+            expect(cb).not.toBeCalled();
+          });
+        });
+
+        describe('unwatch', () => {
+          it('should remove all watch listeners', async () => {
+            const item = storage.defineItem(`${storageArea}:key`);
+            const cb = vi.fn();
+
+            item.watch(cb);
+            storage.unwatch();
+            await item.setValue('123');
+
+            expect(cb).not.toBeCalled();
+          });
+        });
+      });
    },
  );
-
-  describe('defineItem', () => {
-    describe('versioning', () => {
-      it('should migrate values to the latest when a version upgrade is detected', async () => {
-        await fakeBrowser.storage.local.set({
-          count: 2,
-          count$: { v: 1 },
-        });
-        const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
-        const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
-
-        const item = storage.defineItem<number, { v: number }>(`local:count`, {
-          defaultValue: 0,
-          version: 3,
-          migrations: {
-            2: migrateToV2,
-            3: migrateToV3,
-          },
-        });
-        await triggerUpdate();
-
-        const actualValue = await item.getValue();
-        const actualMeta = await item.getMeta();
-
-        expect(actualValue).toEqual(12);
-        expect(actualMeta).toEqual({ v: 3 });
-
-        expect(migrateToV2).toBeCalledTimes(1);
-        expect(migrateToV2).toBeCalledWith(2);
-
-        expect(migrateToV3).toBeCalledTimes(1);
-        expect(migrateToV3).toBeCalledWith(4);
-      });
-
-      it("should not run migrations if the value doesn't exist yet", async () => {
-        const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
-        const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
-
-        const item = storage.defineItem<number, { v: number }>(`local:count`, {
-          defaultValue: 0,
-          version: 3,
-          migrations: {
-            2: migrateToV2,
-            3: migrateToV3,
-          },
-        });
-        await triggerUpdate();
-
-        const actualValue = await item.getValue();
-        const actualMeta = await item.getMeta();
-
-        expect(actualValue).toEqual(0);
-        expect(actualMeta).toEqual({});
-
-        expect(migrateToV2).not.toBeCalled();
-        expect(migrateToV3).not.toBeCalled();
-      });
-
-      it('should run the v2 migration when converting an unversioned item to a versioned one', async () => {
-        await fakeBrowser.storage.local.set({
-          count: 2,
-        });
-        const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
-
-        const item = storage.defineItem<number, { v: number }>(`local:count`, {
-          defaultValue: 0,
-          version: 2,
-          migrations: {
-            2: migrateToV2,
-          },
-        });
-        await triggerUpdate();
-
-        const actualValue = await item.getValue();
-        const actualMeta = await item.getMeta();
-
-        expect(actualValue).toEqual(4);
-        expect(actualMeta).toEqual({ v: 2 });
-
-        expect(migrateToV2).toBeCalledTimes(1);
-        expect(migrateToV2).toBeCalledWith(2);
-      });
-
-      it('should not run old migrations if the version is unchanged', async () => {
-        await fakeBrowser.storage.local.set({
-          count: 2,
-          count$: { v: 3 },
-        });
-        const migrateToV2 = vi.fn((oldCount) => oldCount * 2);
-        const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
-
-        storage.defineItem<number, { v: number }>(`local:count`, {
-          defaultValue: 0,
-          version: 3,
-          migrations: {
-            2: migrateToV2,
-            3: migrateToV3,
-          },
-        });
-        await triggerUpdate();
-
-        expect(migrateToV2).not.toBeCalled();
-        expect(migrateToV3).not.toBeCalled();
-      });
-
-      it('should skip missing migration functions', async () => {
-        await fakeBrowser.storage.local.set({
-          count: 2,
-          count$: { v: 0 },
-        });
-        const migrateToV1 = vi.fn((oldCount) => oldCount * 1);
-        const migrateToV3 = vi.fn((oldCount) => oldCount * 3);
-
-        const item = storage.defineItem<number, { v: number }>(`local:count`, {
-          defaultValue: 0,
-          version: 3,
-          migrations: {
-            1: migrateToV1,
-            3: migrateToV3,
-          },
-        });
-        await triggerUpdate();
-
-        const actualValue = await item.getValue();
-        const actualMeta = await item.getMeta();
-
-        expect(actualValue).toEqual(6);
-        expect(actualMeta).toEqual({ v: 3 });
-
-        expect(migrateToV1).toBeCalledTimes(1);
-        expect(migrateToV1).toBeCalledWith(2);
-
-        expect(migrateToV3).toBeCalledTimes(1);
-        expect(migrateToV3).toBeCalledWith(2);
-      });
-
-      it('should throw an error if the new version is less than the previous version', async () => {
-        const prevVersion = 2;
-        const nextVersion = 1;
-        await fakeBrowser.storage.local.set({
-          count: 0,
-          count$: { v: prevVersion },
-        });
-
-        const item = storage.defineItem(`local:count`, {
-          defaultValue: 0,
-          version: nextVersion,
-        });
-        await triggerUpdate();
-
-        await expect(item.migrate()).rejects.toThrow(
-          'Version downgrade detected (v2 -> v1) for "local:count"',
-        );
-      });
-    });
-
-    describe('getValue', () => {
-      it('should return the value from storage', async () => {
-        const expected = 2;
-        const item = storage.defineItem<number>(`local:count`);
-        await fakeBrowser.storage.local.set({ count: expected });
-
-        const actual = await item.getValue();
-
-        expect(actual).toBe(expected);
-      });
-
-      it('should return null if missing', async () => {
-        const item = storage.defineItem<number>(`local:count`);
-
-        const actual = await item.getValue();
-
-        expect(actual).toBeNull();
-      });
-
-      it('should return the provided default value if missing', async () => {
-        const expected = 0;
-        const item = storage.defineItem(`local:count`, {
-          defaultValue: expected,
-        });
-
-        const actual = await item.getValue();
-
-        expect(actual).toEqual(expected);
-      });
-    });
-
-    describe('getMeta', () => {
-      it('should return the value from storage at key+$', async () => {
-        const expected = { v: 2 };
-        const item = storage.defineItem<number, { v: number }>(`local:count`);
-        await fakeBrowser.storage.local.set({ count$: expected });
-
-        const actual = await item.getMeta();
-
-        expect(actual).toBe(expected);
-      });
-
-      it('should return an empty object if missing', async () => {
-        const expected = {};
-        const item = storage.defineItem<number, { v: number }>(`local:count`);
-
-        const actual = await item.getMeta();
-
-        expect(actual).toEqual(expected);
-      });
-    });
-
-    describe('setValue', () => {
-      it('should set the value in storage', async () => {
-        const expected = 1;
-        const item = storage.defineItem<number>(`local:count`);
-
-        await item.setValue(expected);
-        const actual = await item.getValue();
-
-        expect(actual).toBe(expected);
-      });
-
-      it.each([undefined, null])(
-        'should remove the value in storage when %s is passed in',
-        async (value) => {
-          const item = storage.defineItem<number>(`local:count`);
-
-          // @ts-expect-error: undefined is not assignable to null, but we're testing that case on purpose
-          await item.setValue(value);
-          const actual = await item.getValue();
-
-          expect(actual).toBeNull();
-        },
-      );
-    });
-
-    describe('setMeta', () => {
-      it('should set metadata at key+$', async () => {
-        const expected = { date: Date.now() };
-        const item = storage.defineItem<number, { date: number }>(
-          `local:count`,
-        );
-
-        await item.setMeta(expected);
-        const actual = await item.getMeta();
-
-        expect(actual).toEqual(expected);
-      });
-
-      it('should add to metadata if already present', async () => {
-        const existing = { v: 2 };
-        const newFields = { date: Date.now() };
-        const expected = { ...existing, ...newFields };
-        const item = storage.defineItem<number, { date: number; v: number }>(
-          `local:count`,
-        );
-        await fakeBrowser.storage.local.set({
-          count$: existing,
-        });
-
-        await item.setMeta(newFields);
-        const actual = await item.getMeta();
-
-        expect(actual).toEqual(expected);
-      });
-    });
-
-    describe('removeValue', () => {
-      it('should remove the key from storage', async () => {
-        const item = storage.defineItem(`local:count`);
-        await fakeBrowser.storage.local.set({ count: 456 });
-
-        await item.removeValue();
-        const actual = await item.getValue();
-
-        expect(actual).toBeNull();
-      });
-
-      it('should not remove the metadata by default', async () => {
-        const item = storage.defineItem(`local:count`);
-        const expected = { v: 1 };
-        await fakeBrowser.storage.local.set({
-          count$: expected,
-          count: 3,
-        });
-
-        await item.removeValue();
-        const actual = await item.getMeta();
-
-        expect(actual).toEqual(expected);
-      });
-
-      it('should remove the metadata when requested', async () => {
-        const item = storage.defineItem(`local:count`);
-        await fakeBrowser.storage.local.set({
-          count$: { v: 1 },
-          count: 3,
-        });
-
-        await item.removeValue({ removeMeta: true });
-        const actual = await item.getMeta();
-
-        expect(actual).toEqual({});
-      });
-    });
-
-    describe('removeMeta', () => {
-      it('should remove all metadata', async () => {
-        const item = storage.defineItem<number, { v: number }>(`local:count`);
-        await fakeBrowser.storage.local.set({ count$: { v: 4 } });
-
-        await item.removeMeta();
-        const actual = await item.getMeta();
-
-        expect(actual).toEqual({});
-      });
-
-      it('should only remove specific properties', async () => {
-        const item = storage.defineItem<number, { v: number; d: number }>(
-          `local:count`,
-        );
-        await fakeBrowser.storage.local.set({
-          count$: { v: 4, d: Date.now() },
-        });
-
-        await item.removeMeta(['d']);
-        const actual = await item.getMeta();
-
-        expect(actual).toEqual({ v: 4 });
-      });
-    });
-
-    describe('watch', () => {
-      it("should not trigger if the changed key is different from the item's key", async () => {
-        const item = storage.defineItem(`local:key`);
-        const cb = vi.fn();
-
-        item.watch(cb);
-        await storage.setItem(`local:not-the-key`, '123');
-
-        expect(cb).not.toBeCalled();
-      });
-
-      it("should not trigger if the value doesn't change", async () => {
-        const item = storage.defineItem(`local:key`);
-        const cb = vi.fn();
-        const value = '123';
-
-        await item.setValue(value);
-        item.watch(cb);
-        await item.setValue(value);
-
-        expect(cb).not.toBeCalled();
-      });
-
-      it('should call the callback when the value changes', async () => {
-        const item = storage.defineItem(`local:key`);
-        const cb = vi.fn();
-        const newValue = '123';
-        const oldValue = null;
-
-        item.watch(cb);
-        await item.setValue(newValue);
-
-        expect(cb).toBeCalledTimes(1);
-        expect(cb).toBeCalledWith(newValue, oldValue);
-      });
-
-      it('should use the default value for the newValue when the item is removed', async () => {
-        const defaultValue = 'default';
-        const item = storage.defineItem<string>(`local:key`, {
-          defaultValue,
-        });
-        const cb = vi.fn();
-        const oldValue = '123';
-        await item.setValue(oldValue);
-
-        item.watch(cb);
-        await item.removeValue();
-
-        expect(cb).toBeCalledTimes(1);
-        expect(cb).toBeCalledWith(defaultValue, oldValue);
-      });
-
-      it("should use the default value for the oldItem when the item didn't exist in storage yet", async () => {
-        const defaultValue = 'default';
-        const item = storage.defineItem<string>(`local:key`, {
-          defaultValue,
-        });
-        const cb = vi.fn();
-        const newValue = '123';
-        await item.removeValue();
-
-        item.watch(cb);
-        await item.setValue(newValue);
-
-        expect(cb).toBeCalledTimes(1);
-        expect(cb).toBeCalledWith(newValue, defaultValue);
-      });
-
-      it('should remove the listener when calling the returned function', async () => {
-        const item = storage.defineItem(`local:key`);
-        const cb = vi.fn();
-
-        const unwatch = item.watch(cb);
-        unwatch();
-        await item.setValue('123');
-
-        expect(cb).not.toBeCalled();
-      });
-    });
-
-    describe('unwatch', () => {
-      it('should remove all watch listeners', async () => {
-        const item = storage.defineItem(`local:key`);
-        const cb = vi.fn();
-
-        item.watch(cb);
-        storage.unwatch();
-        await item.setValue('123');
-
-        expect(cb).not.toBeCalled();
-      });
-    });
-
-    describe('defaultValue', () => {
-      it('should return the default value when provided', () => {
-        const defaultValue = 123;
-        const item = storage.defineItem(`local:test`, {
-          defaultValue,
-        });
-
-        expect(item.defaultValue).toBe(defaultValue);
-      });
-
-      it('should return null when not provided', () => {
-        const item = storage.defineItem<number>(`local:test`);
-
-        expect(item.defaultValue).toBeNull();
-      });
-    });
-
-    describe('types', () => {
-      it('should define a nullable value when options are not passed', () => {
-        const item = storage.defineItem<number>(`local:test`);
-        expectTypeOf(item).toEqualTypeOf<WxtStorageItem<number | null, {}>>();
-      });
-
-      it('should define a non-null value when options are passed with a nullish default value', () => {
-        const item = storage.defineItem(`local:test`, {
-          defaultValue: 123,
-        });
-        expectTypeOf(item).toEqualTypeOf<WxtStorageItem<number, {}>>();
-      });
-
-      it('should define a nullable value when options are passed with null default value', () => {
-        const item = storage.defineItem<number | null>(`local:test`, {
-          defaultValue: null,
-        });
-        expectTypeOf(item).toEqualTypeOf<WxtStorageItem<number | null, {}>>();
-      });
-    });
-  });
 });
@@ -1,12 +1,16 @@
 import cac from 'cac';
+import { version } from '~/version';
 import { build, clean, createServer, initialize, prepare, zip } from '~/core';
-import {
-  createAliasedCommand,
-  getArrayFromFlags,
-  wrapAction,
-} from './cli-utils';
+import consola, { LogLevels } from 'consola';
+import { printHeader } from '~/core/utils/log';
+import { formatDuration } from '~/core/utils/time';
+
+// TODO: Remove. See https://github.com/wxt-dev/wxt/issues/277
+process.env.VITE_CJS_IGNORE_WARNING = 'true';

 const cli = cac('wxt');
+cli.help();
+cli.version(version);

 cli.option('--debug', 'enable debug mode');

@@ -16,13 +20,6 @@ cli
  .option('-c, --config <file>', 'use specified config file')
  .option('-m, --mode <mode>', 'set env mode')
  .option('-b, --browser <browser>', 'specify a browser')
-  .option(
-    '-e, --filter-entrypoint <entrypoint>',
-    'only build specific entrypoints',
-    {
-      type: [],
-    },
-  )
  .option('--mv3', 'target manifest v3')
  .option('--mv2', 'target manifest v2')
  .action(
@@ -34,7 +31,6 @@ cli
        manifestVersion: flags.mv3 ? 3 : flags.mv2 ? 2 : undefined,
        configFile: flags.config,
        debug: flags.debug,
-        filterEntrypoints: getArrayFromFlags(flags, 'filterEntrypoint'),
      });
      await server.start();
      return { isOngoing: true };
@@ -47,13 +43,6 @@ cli
  .option('-c, --config <file>', 'use specified config file')
  .option('-m, --mode <mode>', 'set env mode')
  .option('-b, --browser <browser>', 'specify a browser')
-  .option(
-    '-e, --filter-entrypoint <entrypoint>',
-    'only build specific entrypoints',
-    {
-      type: [],
-    },
-  )
  .option('--mv3', 'target manifest v3')
  .option('--mv2', 'target manifest v2')
  .option('--analyze', 'visualize extension bundle')
@@ -66,8 +55,9 @@ cli
        manifestVersion: flags.mv3 ? 3 : flags.mv2 ? 2 : undefined,
        configFile: flags.config,
        debug: flags.debug,
-        analysis: flags.analyze ? { enabled: true } : undefined,
-        filterEntrypoints: getArrayFromFlags(flags, 'filterEntrypoint'),
+        analysis: {
+          enabled: flags.analyze,
+        },
      });
    }),
  );
@@ -135,12 +125,43 @@ cli
    ),
  );

-// SUBMIT
-createAliasedCommand(
-  cli,
-  'submit',
-  'publish-extension',
-  'https://www.npmjs.com/publish-browser-extension',
-);
+cli.parse();

-export default cli;
+/**
+ * Wrap an action handler to add a timer, error handling, and maybe enable debug mode.
+ */
+function wrapAction(
+  cb: (
+    ...args: any[]
+  ) => void | { isOngoing?: boolean } | Promise<void | { isOngoing?: boolean }>,
+  options?: {
+    disableFinishedLog?: boolean;
+  },
+) {
+  return async (...args: any[]) => {
+    // Enable consola's debug mode globally at the start of all commands when the `--debug` flag is
+    // passed
+    const isDebug = !!args.find((arg) => arg?.debug);
+    if (isDebug) {
+      consola.level = LogLevels.debug;
+    }
+
+    const startTime = Date.now();
+    try {
+      printHeader();
+
+      const status = await cb(...args);
+
+      if (!status?.isOngoing && !options?.disableFinishedLog)
+        consola.success(
+          `Finished in ${formatDuration(Date.now() - startTime)}`,
+        );
+    } catch (err) {
+      consola.fail(
+        `Command failed after ${formatDuration(Date.now() - startTime)}`,
+      );
+      consola.error(err);
+      process.exit(1);
+    }
+  };
+}
@@ -1,380 +0,0 @@
-import { describe, it, vi, beforeEach, expect } from 'vitest';
-import { build } from '~/core/build';
-import { createServer } from '~/core/create-server';
-import { zip } from '~/core/zip';
-import { prepare } from '~/core/prepare';
-import { clean } from '~/core/clean';
-import { initialize } from '~/core/initialize';
-import { mock } from 'vitest-mock-extended';
-import consola from 'consola';
-
-vi.mock('~/core/build');
-const buildMock = vi.mocked(build);
-
-vi.mock('~/core/create-server');
-const createServerMock = vi.mocked(createServer);
-
-vi.mock('~/core/zip');
-const zipMock = vi.mocked(zip);
-
-vi.mock('~/core/prepare');
-const prepareMock = vi.mocked(prepare);
-
-vi.mock('~/core/clean');
-const cleanMock = vi.mocked(clean);
-
-vi.mock('~/core/initialize');
-const initializeMock = vi.mocked(initialize);
-
-consola.wrapConsole();
-
-const ogArgv = process.argv;
-
-function mockArgv(...args: string[]) {
-  process.argv = ['/bin/node', 'bin/wxt.mjs', ...args];
-}
-
-async function importCli() {
-  await import('~/cli');
-}
-
-describe('CLI', () => {
-  beforeEach(() => {
-    vi.resetModules();
-    process.argv = ogArgv;
-    createServerMock.mockResolvedValue(mock());
-  });
-
-  describe('dev', () => {
-    it('should not pass any config when no flags are passed', async () => {
-      mockArgv();
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({});
-    });
-
-    it('should respect passing a custom root', async () => {
-      mockArgv('path/to/root');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        root: 'path/to/root',
-      });
-    });
-
-    it('should respect a custom config file', async () => {
-      mockArgv('-c', './path/to/config.ts');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        configFile: './path/to/config.ts',
-      });
-    });
-
-    it('should respect passing a custom mode', async () => {
-      mockArgv('-m', 'development');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        mode: 'development',
-      });
-    });
-
-    it('should respect passing a custom browser', async () => {
-      mockArgv('-b', 'firefox');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        browser: 'firefox',
-      });
-    });
-
-    it('should pass correct filtered entrypoints', async () => {
-      mockArgv('-e', 'popup', '-e', 'options');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        filterEntrypoints: ['popup', 'options'],
-      });
-    });
-
-    it('should respect passing --mv2', async () => {
-      mockArgv('--mv2');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        manifestVersion: 2,
-      });
-    });
-
-    it('should respect passing --mv3', async () => {
-      mockArgv('--mv3');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        manifestVersion: 3,
-      });
-    });
-
-    it('should respect passing --debug', async () => {
-      mockArgv('--debug');
-      await importCli();
-
-      expect(createServerMock).toBeCalledWith({
-        debug: true,
-      });
-    });
-  });
-
-  describe('build', () => {
-    it('should not pass any config when no flags are passed', async () => {
-      mockArgv('build');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({});
-    });
-
-    it('should respect passing a custom root', async () => {
-      mockArgv('build', 'path/to/root');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        root: 'path/to/root',
-      });
-    });
-
-    it('should respect a custom config file', async () => {
-      mockArgv('build', '-c', './path/to/config.ts');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        configFile: './path/to/config.ts',
-      });
-    });
-
-    it('should respect passing a custom mode', async () => {
-      mockArgv('build', '-m', 'development');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        mode: 'development',
-      });
-    });
-
-    it('should respect passing a custom browser', async () => {
-      mockArgv('build', '-b', 'firefox');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        browser: 'firefox',
-      });
-    });
-
-    it('should pass correct filtered entrypoints', async () => {
-      mockArgv('build', '-e', 'popup', '-e', 'options');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        filterEntrypoints: ['popup', 'options'],
-      });
-    });
-
-    it('should respect passing --mv2', async () => {
-      mockArgv('build', '--mv2');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        manifestVersion: 2,
-      });
-    });
-
-    it('should respect passing --mv3', async () => {
-      mockArgv('build', '--mv3');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        manifestVersion: 3,
-      });
-    });
-
-    it('should include analysis in the build', async () => {
-      mockArgv('build', '--analyze');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        analysis: {
-          enabled: true,
-        },
-      });
-    });
-
-    it('should respect passing --debug', async () => {
-      mockArgv('build', '--debug');
-      await importCli();
-
-      expect(buildMock).toBeCalledWith({
-        debug: true,
-      });
-    });
-  });
-
-  describe('zip', () => {
-    it('should not pass any config when no flags are passed', async () => {
-      mockArgv('zip');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({});
-    });
-
-    it('should respect passing a custom root', async () => {
-      mockArgv('zip', 'path/to/root');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({
-        root: 'path/to/root',
-      });
-    });
-
-    it('should respect a custom config file', async () => {
-      mockArgv('zip', '-c', './path/to/config.ts');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({
-        configFile: './path/to/config.ts',
-      });
-    });
-
-    it('should respect passing a custom mode', async () => {
-      mockArgv('zip', '-m', 'development');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({
-        mode: 'development',
-      });
-    });
-
-    it('should respect passing a custom browser', async () => {
-      mockArgv('zip', '-b', 'firefox');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({
-        browser: 'firefox',
-      });
-    });
-
-    it('should respect passing --mv2', async () => {
-      mockArgv('zip', '--mv2');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({
-        manifestVersion: 2,
-      });
-    });
-
-    it('should respect passing --mv3', async () => {
-      mockArgv('zip', '--mv3');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({
-        manifestVersion: 3,
-      });
-    });
-
-    it('should respect passing --debug', async () => {
-      mockArgv('zip', '--debug');
-      await importCli();
-
-      expect(zipMock).toBeCalledWith({
-        debug: true,
-      });
-    });
-  });
-
-  describe('prepare', () => {
-    it('should not pass any config when no flags are passed', async () => {
-      mockArgv('prepare');
-      await importCli();
-
-      expect(prepareMock).toBeCalledWith({});
-    });
-
-    it('should respect passing a custom root', async () => {
-      mockArgv('prepare', 'path/to/root');
-      await importCli();
-
-      expect(prepareMock).toBeCalledWith({
-        root: 'path/to/root',
-      });
-    });
-
-    it('should respect a custom config file', async () => {
-      mockArgv('prepare', '-c', './path/to/config.ts');
-      await importCli();
-
-      expect(prepareMock).toBeCalledWith({
-        configFile: './path/to/config.ts',
-      });
-    });
-
-    it('should respect passing --debug', async () => {
-      mockArgv('prepare', '--debug');
-      await importCli();
-
-      expect(prepareMock).toBeCalledWith({
-        debug: true,
-      });
-    });
-  });
-
-  describe('clean', () => {
-    it('should not pass any config when no flags are passed', async () => {
-      mockArgv('clean');
-      await importCli();
-
-      expect(cleanMock).toBeCalledWith(undefined);
-    });
-
-    it('should respect passing a custom root', async () => {
-      mockArgv('clean', 'path/to/root');
-      await importCli();
-
-      expect(cleanMock).toBeCalledWith('path/to/root');
-    });
-  });
-
-  describe('init', () => {
-    it('should not pass any options when no flags are passed', async () => {
-      mockArgv('init');
-      await importCli();
-
-      expect(initializeMock).toBeCalledWith({});
-    });
-
-    it('should respect the provided folder', async () => {
-      mockArgv('init', 'path/to/folder');
-      await importCli();
-
-      expect(initializeMock).toBeCalledWith({
-        directory: 'path/to/folder',
-      });
-    });
-
-    it('should respect passing --template', async () => {
-      mockArgv('init', '-t', 'vue');
-      await importCli();
-
-      expect(initializeMock).toBeCalledWith({
-        template: 'vue',
-      });
-    });
-
-    it('should respect passing --pm', async () => {
-      mockArgv('init', '--pm', 'pnpm');
-      await importCli();
-
-      expect(initializeMock).toBeCalledWith({
-        packageManager: 'pnpm',
-      });
-    });
-  });
-});
@@ -1,94 +0,0 @@
-import { CAC, Command } from 'cac';
-import consola, { LogLevels } from 'consola';
-import { exec } from '~/core/utils/exec';
-import { printHeader } from '~/core/utils/log';
-import { formatDuration } from '~/core/utils/time';
-import { ValidationError } from '~/core/utils/validation';
-import { registerWxt } from '~/core/wxt';
-
-/**
- * Wrap an action handler to add a timer, error handling, and maybe enable debug mode.
- */
-export function wrapAction(
-  cb: (
-    ...args: any[]
-  ) => void | { isOngoing?: boolean } | Promise<void | { isOngoing?: boolean }>,
-  options?: {
-    disableFinishedLog?: boolean;
-  },
-) {
-  return async (...args: any[]) => {
-    // Enable consola's debug mode globally at the start of all commands when the `--debug` flag is
-    // passed
-    const isDebug = !!args.find((arg) => arg?.debug);
-    if (isDebug) {
-      consola.level = LogLevels.debug;
-    }
-
-    const startTime = Date.now();
-    try {
-      printHeader();
-
-      const status = await cb(...args);
-
-      if (!status?.isOngoing && !options?.disableFinishedLog)
-        consola.success(
-          `Finished in ${formatDuration(Date.now() - startTime)}`,
-        );
-    } catch (err) {
-      consola.fail(
-        `Command failed after ${formatDuration(Date.now() - startTime)}`,
-      );
-      if (err instanceof ValidationError) {
-        // Don't log these errors, they've already been logged
-      } else {
-        consola.error(err);
-      }
-      process.exit(1);
-    }
-  };
-}
-
-/**
- * Array flags, when not passed, are either `undefined` or `[undefined]`. This function filters out
- * the
- */
-export function getArrayFromFlags<T>(
-  flags: any,
-  name: string,
-): T[] | undefined {
-  const array = [flags[name]].flat() as Array<T | undefined>;
-  const result = array.filter((item) => item != null) as T[];
-  return result.length ? result : undefined;
-}
-
-const aliasCommandNames = new Set<string>();
-export function createAliasedCommand(
-  base: CAC,
-  name: string,
-  alias: string,
-  docsUrl: string,
-) {
-  const aliasedCommand = base
-    .command(name, `Alias for ${alias} (${docsUrl})`)
-    .allowUnknownOptions()
-    .action(async () => {
-      try {
-        await registerWxt('build');
-
-        const args = process.argv.slice(
-          process.argv.indexOf(aliasedCommand.name) + 1,
-        );
-        await exec(alias, args, {
-          stdio: 'inherit',
-        });
-      } catch {
-        // Let the other aliased CLI log errors, just exit
-        process.exit(1);
-      }
-    });
-  aliasCommandNames.add(aliasedCommand.name);
-}
-export function isAliasedCommand(command: Command | undefined): boolean {
-  return !!command && aliasCommandNames.has(command.name);
-}
@@ -1,19 +0,0 @@
-import cli from './commands';
-import { version } from '~/version';
-import { isAliasedCommand } from './cli-utils';
-
-// TODO: Remove. See https://github.com/wxt-dev/wxt/issues/277
-process.env.VITE_CJS_IGNORE_WARNING = 'true';
-
-// Grab the command that we're trying to run
-cli.parse(process.argv, { run: false });
-
-// If it's not an alias, add the help and version options, then parse again
-if (!isAliasedCommand(cli.matchedCommand)) {
-  cli.help();
-  cli.version(version);
-  cli.parse(process.argv, { run: false });
-}
-
-// Run the alias or command
-await cli.runMatchedCommand();
@@ -15,12 +15,10 @@ export class WxtLocationChangeEvent extends Event {
 * Returns an event name unique to the extension and content script that's running.
 */
 export function getUniqueEventName(eventName: string): string {
-  // During the build process, import.meta.env is not defined when importing
-  // entrypoints to get their metadata.
+  // During the build process, __ENTRYPOINT__ is not defined when importing entrypoints to get their
+  // metadata.
  const entrypointName =
-    typeof import.meta.env === 'undefined'
-      ? 'build'
-      : import.meta.env.ENTRYPOINT;
+    typeof __ENTRYPOINT__ === 'undefined' ? 'build' : __ENTRYPOINT__;

  return `${browser.runtime.id}:${entrypointName}:${eventName}`;
 }
@@ -367,7 +367,7 @@ describe('Content Script UIs', () => {
      });
    });

-    describe('after', () => {
+    describe.todo('after', () => {
      it('should append the UI after the anchor', () => {
        const ui = createIntegratedUi(ctx, {
          position: 'inline',
@@ -119,18 +119,19 @@ export async function createShadowRootUi<TMounted>(
  let mounted: TMounted;

  const mount = () => {
+    // Mount UI inside shadow root
+    mounted = options.onMount(uiContainer, shadow, shadowHost);
+
    // Add shadow root element to DOM
    mountUi(shadowHost, options);
    applyPosition(shadowHost, shadow.querySelector('html'), options);
-    // Mount UI inside shadow root
-    mounted = options.onMount(uiContainer, shadow, shadowHost);
  };

  const remove = () => {
-    // Cleanup mounted state
-    options.onRemove?.(mounted);
    // Detatch shadow root from DOM
    shadowHost.remove();
+    // Cleanup mounted state
+    options.onRemove?.(mounted);
    // Remove children from uiContainer
    while (uiContainer.lastChild)
      uiContainer.removeChild(uiContainer.lastChild);
@@ -210,16 +211,20 @@ function mountUi(
      anchor.append(root);
      break;
    case 'first':
-      anchor.prepend(root);
+      if (anchor.firstChild) {
+        anchor.insertBefore(root, anchor.firstChild);
+      } else {
+        anchor.append(root);
+      }
      break;
    case 'replace':
      anchor.replaceWith(root);
      break;
    case 'after':
-      anchor.parentElement?.insertBefore(root, anchor.nextElementSibling);
+      anchor.replaceWith(anchor, root);
      break;
    case 'before':
-      anchor.parentElement?.insertBefore(root, anchor);
+      anchor.replaceWith(root, anchor);
      break;
    default:
      options.append(anchor, root);
@@ -231,9 +236,7 @@ function mountUi(
 * Load the CSS for the current entrypoint.
 */
 async function loadCss(): Promise<string> {
-  const url = browser.runtime.getURL(
-    `/content-scripts/${import.meta.env.ENTRYPOINT}.css`,
-  );
+  const url = browser.runtime.getURL(`/content-scripts/${__ENTRYPOINT__}.css`);
  try {
    const res = await fetch(url);
    return await res.text();
@@ -1,6 +1,5 @@
 import { BuildOutput, InlineConfig } from '~/types';
-import { internalBuild } from './utils/building';
-import { registerWxt } from './wxt';
+import { getInternalConfig, internalBuild } from './utils/building';

 /**
 * Bundles the extension for production. Returns a promise of the build result. Discovers the `wxt.config.ts` file in
@@ -16,7 +15,6 @@ import { registerWxt } from './wxt';
 * })
 */
 export async function build(config?: InlineConfig): Promise<BuildOutput> {
-  await registerWxt('build', config);
-
-  return await internalBuild();
+  const internalConfig = await getInternalConfig(config ?? {}, 'build');
+  return await internalBuild(internalConfig);
 }
@@ -3,22 +3,19 @@ import {
  BuildStepOutput,
  Entrypoint,
  InlineConfig,
-  ResolvedConfig,
+  InternalConfig,
  UserConfig,
  VirtualEntrypointType,
  WxtBuilder,
  WxtBuilderServer,
 } from '~/types';
 import * as wxtPlugins from './plugins';
-import {
-  getEntrypointBundlePath,
-  isHtmlEntrypoint,
-} from '~/core/utils/entrypoints';
+import { getEntrypointBundlePath } from '~/core/utils/entrypoints';

 export async function createViteBuilder(
  inlineConfig: InlineConfig,
  userConfig: UserConfig,
-  wxtConfig: Omit<ResolvedConfig, 'builder'>,
+  wxtConfig: Omit<InternalConfig, 'builder'>,
 ): Promise<WxtBuilder> {
  const vite = await import('vite');

@@ -47,10 +44,6 @@ export async function createViteBuilder(
    if (config.build.minify == null && wxtConfig.command === 'serve') {
      config.build.minify = false;
    }
-    // Enable inline sourcemaps for the dev command (so content scripts have sourcemaps)
-    if (config.build.sourcemap == null && wxtConfig.command === 'serve') {
-      config.build.sourcemap = 'inline';
-    }

    config.plugins ??= [];
    config.plugins.push(
@@ -66,10 +59,9 @@ export async function createViteBuilder(
      wxtPlugins.noopBackground(),
      wxtPlugins.globals(wxtConfig),
      wxtPlugins.excludeBrowserPolyfill(wxtConfig),
-      wxtPlugins.defineImportMeta(),
    );
    if (wxtConfig.analysis.enabled) {
-      config.plugins.push(wxtPlugins.bundleAnalysis(wxtConfig));
+      config.plugins.push(wxtPlugins.bundleAnalysis());
    }

    return config;
@@ -79,7 +71,23 @@ export async function createViteBuilder(
   * Return the basic config for building an entrypoint in [lib mode](https://vitejs.dev/guide/build.html#library-mode).
   */
  const getLibModeConfig = (entrypoint: Entrypoint): vite.InlineConfig => {
-    const entry = getRollupEntry(entrypoint);
+    let virtualEntrypointType: VirtualEntrypointType | undefined;
+    switch (entrypoint.type) {
+      case 'background':
+      case 'unlisted-script':
+        virtualEntrypointType = entrypoint.type;
+        break;
+      case 'content-script':
+        virtualEntrypointType =
+          entrypoint.options.world === 'MAIN'
+            ? 'content-script-main-world'
+            : 'content-script-isolated-world';
+        break;
+    }
+    const entry = virtualEntrypointType
+      ? `virtual:wxt-${virtualEntrypointType}?${entrypoint.inputPath}`
+      : entrypoint.inputPath;
+
    const plugins: NonNullable<vite.UserConfig['plugins']> = [
      wxtPlugins.entrypointGroupGlobals(entrypoint),
    ];
@@ -136,9 +144,6 @@ export async function createViteBuilder(
   * Return the basic config for building multiple entrypoints in [multi-page mode](https://vitejs.dev/guide/build.html#multi-page-app).
   */
  const getMultiPageConfig = (entrypoints: Entrypoint[]): vite.InlineConfig => {
-    const htmlEntrypoints = new Set(
-      entrypoints.filter(isHtmlEntrypoint).map((e) => e.name),
-    );
    return {
      mode: wxtConfig.mode,
      plugins: [
@@ -148,18 +153,14 @@ export async function createViteBuilder(
      build: {
        rollupOptions: {
          input: entrypoints.reduce<Record<string, string>>((input, entry) => {
-            input[entry.name] = getRollupEntry(entry);
+            input[entry.name] = entry.inputPath;
            return input;
          }, {}),
          output: {
            // Include a hash to prevent conflicts
            chunkFileNames: 'chunks/[name]-[hash].js',
-            entryFileNames: ({ name }) => {
-              // HTML main JS files go in the chunks folder
-              if (htmlEntrypoints.has(name)) return 'chunks/[name]-[hash].js';
-              // Scripts are output in the root folder
-              return '[name].js';
-            },
+            // Include a hash to prevent conflicts
+            entryFileNames: 'chunks/[name]-[hash].js',
            // We can't control the "name", so we need a hash to prevent conflicts
            assetFileNames: 'assets/[name]-[hash].[ext]',
          },
@@ -229,9 +230,6 @@ export async function createViteBuilder(
        async listen() {
          await viteServer.listen(info.port);
        },
-        async close() {
-          await viteServer.close();
-        },
        transformHtml(...args) {
          return viteServer.transformIndexHtml(...args);
        },
@@ -258,26 +256,3 @@ function getBuildOutputChunks(
  if (Array.isArray(result)) return result.flatMap(({ output }) => output);
  return result.output;
 }
-
-/**
- * Returns the input module ID (virtual or real file) for an entrypoint. The returned string should
- * be passed as an input to rollup.
- */
-function getRollupEntry(entrypoint: Entrypoint): string {
-  let virtualEntrypointType: VirtualEntrypointType | undefined;
-  switch (entrypoint.type) {
-    case 'background':
-    case 'unlisted-script':
-      virtualEntrypointType = entrypoint.type;
-      break;
-    case 'content-script':
-      virtualEntrypointType =
-        entrypoint.options.world === 'MAIN'
-          ? 'content-script-main-world'
-          : 'content-script-isolated-world';
-      break;
-  }
-  return virtualEntrypointType
-    ? `virtual:wxt-${virtualEntrypointType}?${entrypoint.inputPath}`
-    : entrypoint.inputPath;
-}
@@ -1,64 +0,0 @@
-import { describe, expect, it } from 'vitest';
-import { Window } from 'happy-dom';
-import { pointToDevServer } from '../devHtmlPrerender';
-import {
-  fakeDevServer,
-  fakeResolvedConfig,
-} from '~/core/utils/testing/fake-objects';
-import { normalizePath } from '~/core/utils/paths';
-import { resolve } from 'node:path';
-
-describe('Dev HTML Prerender Plugin', () => {
-  describe('pointToDevServer', () => {
-    it.each([
-      // File paths should be resolved
-      ['style.css', 'http://localhost:5173/entrypoints/popup/style.css'],
-      ['./style.css', 'http://localhost:5173/entrypoints/popup/style.css'],
-      ['../style.css', 'http://localhost:5173/entrypoints/style.css'],
-      ['~/assets/style.css', 'http://localhost:5173/assets/style.css'],
-      ['~~/assets/style.css', 'http://localhost:5173/assets/style.css'],
-      ['~local/style.css', 'http://localhost:5173/style.css'],
-      ['~absolute/style.css', 'http://localhost:5173/assets/style.css'],
-      ['~file', 'http://localhost:5173/example.css'],
-      // Absolute paths are loaded with the `/@fs/` base path
-      [
-        '~outside/test.css',
-        `http://localhost:5173/@fs${
-          process.platform === 'win32'
-            ? '/' + normalizePath(resolve('/some/non-root/test.css')) // "/D:/some/non-root/test.css"
-            : '/some/non-root/test.css'
-        }`,
-      ],
-      // URLs should not be changed
-      ['https://example.com/style.css', 'https://example.com/style.css'],
-    ])('should transform "%s" into "%s"', (input, expected) => {
-      const { document } = new Window({
-        url: 'http://localhost',
-      });
-      const root = '/some/root';
-      const config = fakeResolvedConfig({
-        root,
-        alias: {
-          '~local': '.',
-          '~absolute': `${root}/assets`,
-          '~file': `${root}/example.css`,
-          '~outside': `${root}/../non-root`,
-          '~~': root,
-          '~': root,
-        },
-      });
-      const server = fakeDevServer({
-        hostname: 'localhost',
-        port: 5173,
-        origin: 'http://localhost:5173',
-      });
-      const id = root + '/entrypoints/popup/index.html';
-
-      document.head.innerHTML = `<link rel="stylesheet" href="${input}" />`;
-      pointToDevServer(config, server, id, document as any, 'link', 'href');
-
-      const actual = document.querySelector('link')!;
-      expect(actual.getAttribute('href')).toBe(expected);
-    });
-  });
-});
@@ -1,25 +1,12 @@
 import type * as vite from 'vite';
 import { visualizer } from 'rollup-plugin-visualizer';
-import { ResolvedConfig } from '~/types';
-import path from 'node:path';

 let increment = 0;

-export function bundleAnalysis(
-  config: Omit<ResolvedConfig, 'builder'>,
-): vite.Plugin {
+export function bundleAnalysis(): vite.Plugin {
  return visualizer({
+    emitFile: true,
    template: 'raw-data',
-    filename: path.resolve(
-      config.analysis.outputDir,
-      `${config.analysis.outputName}-${increment++}.json`,
-    ),
-  });
-}
-
-/**
- * @deprecated FOR TESTING ONLY.
- */
-export function resetBundleIncrement() {
-  increment = 0;
+    filename: `stats-${increment++}.json`,
+  }) as vite.Plugin;
 }
@@ -1,5 +1,5 @@
 import type * as vite from 'vite';
-import { Entrypoint, ResolvedConfig } from '~/types';
+import { Entrypoint, InternalConfig } from '~/types';
 import { getEntrypointBundlePath } from '~/core/utils/entrypoints';

 /**
@@ -14,7 +14,7 @@ import { getEntrypointBundlePath } from '~/core/utils/entrypoints';
 */
 export function cssEntrypoints(
  entrypoint: Entrypoint,
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.Plugin {
  return {
    name: 'wxt:css-entrypoint',
@@ -1,19 +0,0 @@
-/**
- * Overrides definitions for `import.meta.*`
- *
- * - `import.meta.url`: Without this, background service workers crash trying to access
- *   `document.location`, see https://github.com/wxt-dev/wxt/issues/392
- */
-export function defineImportMeta() {
-  return {
-    name: 'wxt:define',
-    config() {
-      return {
-        define: {
-          // This works for all extension contexts, including background service worker
-          'import.meta.url': 'self.location.href',
-        },
-      };
-    },
-  };
-}
@@ -1,9 +1,8 @@
 import type * as vite from 'vite';
-import { ResolvedConfig, WxtDevServer } from '~/types';
+import { InternalConfig } from '~/types';
 import { getEntrypointName } from '~/core/utils/entrypoints';
 import { parseHTML } from 'linkedom';
-import { dirname, relative, resolve } from 'node:path';
-import { normalizePath } from '~/core/utils/paths';
+import { dirname, isAbsolute, relative, resolve } from 'node:path';

 // Cache the preamble script for all devHtmlPrerender plugins, not just one
 let reactRefreshPreamble = '';
@@ -12,7 +11,7 @@ let reactRefreshPreamble = '';
 * Pre-renders the HTML entrypoints when building the extension to connect to the dev server.
 */
 export function devHtmlPrerender(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.PluginOption {
  const htmlReloadId = '@wxt/reload-html';
  const resolvedHtmlReloadId = resolve(
@@ -48,10 +47,25 @@ export function devHtmlPrerender(

        const { document } = parseHTML(code);

-        const _pointToDevServer = (querySelector: string, attr: string) =>
-          pointToDevServer(config, server, id, document, querySelector, attr);
-        _pointToDevServer('script[type=module]', 'src');
-        _pointToDevServer('link[rel=stylesheet]', 'href');
+        const pointToDevServer = (
+          querySelector: string,
+          attr: string,
+        ): void => {
+          document.querySelectorAll(querySelector).forEach((element) => {
+            const src = element.getAttribute(attr);
+            if (!src) return;
+
+            if (isAbsolute(src)) {
+              element.setAttribute(attr, server.origin + src);
+            } else if (src.startsWith('.')) {
+              const abs = resolve(dirname(id), src);
+              const pathname = relative(config.root, abs);
+              element.setAttribute(attr, `${server.origin}/${pathname}`);
+            }
+          });
+        };
+        pointToDevServer('script[type=module]', 'src');
+        pointToDevServer('link[rel=stylesheet]', 'href');

        // Add a script to add page reloading
        const reloader = document.createElement('script');
@@ -132,63 +146,3 @@ export function devHtmlPrerender(
    },
  ];
 }
-
-export function pointToDevServer(
-  config: Omit<ResolvedConfig, 'builder'>,
-  server: WxtDevServer,
-  id: string,
-  document: Document,
-  querySelector: string,
-  attr: string,
-) {
-  document.querySelectorAll(querySelector).forEach((element) => {
-    const src = element.getAttribute(attr);
-    if (!src || isUrl(src)) return;
-
-    let resolvedAbsolutePath: string | undefined;
-
-    // Check if src uses a project alias
-    const matchingAlias = Object.entries(config.alias).find(([key]) =>
-      src.startsWith(key),
-    );
-    if (matchingAlias) {
-      // Matches a import alias
-      const [alias, replacement] = matchingAlias;
-      resolvedAbsolutePath = resolve(
-        config.root,
-        src.replace(alias, replacement),
-      );
-    } else {
-      // Some file path relative to the HTML file
-      resolvedAbsolutePath = resolve(dirname(id), src);
-    }
-
-    // Apply the final file path
-    if (resolvedAbsolutePath) {
-      const relativePath = normalizePath(
-        relative(config.root, resolvedAbsolutePath),
-      );
-
-      if (relativePath.startsWith('.')) {
-        // Outside the config.root directory, serve the absolute path
-        let path = normalizePath(resolvedAbsolutePath);
-        // Add "/" to start of windows paths ("D:/some/path" -> "/D:/some/path")
-        if (!path.startsWith('/')) path = '/' + path;
-        element.setAttribute(attr, `${server.origin}/@fs${path}`);
-      } else {
-        // Inside the project, use relative path
-        const url = new URL(relativePath, server.origin);
-        element.setAttribute(attr, url.href);
-      }
-    }
-  });
-}
-
-function isUrl(str: string): boolean {
-  try {
-    new URL(str);
-    return true;
-  } catch {
-    return false;
-  }
-}
@@ -1,11 +1,11 @@
 import { Plugin } from 'vite';
-import { ResolvedConfig } from '~/types';
+import { InternalConfig } from '~/types';

 /**
 * Defines global constants about the dev server. Helps scripts connect to the server's web socket.
 */
 export function devServerGlobals(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): Plugin {
  return {
    name: 'wxt:dev-server-globals',
@@ -1,5 +1,5 @@
 import { Plugin } from 'vite';
-import { ResolvedConfig } from '~/types';
+import { InternalConfig } from '~/types';
 import { fetchCached } from '~/core/utils/network';

 /**
@@ -9,7 +9,7 @@ import { fetchCached } from '~/core/utils/network';
 * @example
 * import "url:https://google-tagmanager.com/gtag?id=XYZ";
 */
-export function download(config: Omit<ResolvedConfig, 'builder'>): Plugin {
+export function download(config: Omit<InternalConfig, 'builder'>): Plugin {
  return {
    name: 'wxt:download',
    resolveId(id) {
@@ -14,7 +14,7 @@ export function entrypointGroupGlobals(
      const define: vite.InlineConfig['define'] = {};
      let name = Array.isArray(entrypointGroup) ? 'html' : entrypointGroup.name;
      for (const global of getEntrypointGlobals(name)) {
-        define[`import.meta.env.${global.name}`] = JSON.stringify(global.value);
+        define[global.name] = JSON.stringify(global.value);
      }
      return {
        define,
@@ -1,4 +1,4 @@
-import { ResolvedConfig } from '~/types';
+import { InternalConfig } from '~/types';
 import type * as vite from 'vite';

 /**
@@ -7,7 +7,7 @@ import type * as vite from 'vite';
 * virtual module.
 */
 export function excludeBrowserPolyfill(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.Plugin {
  const virtualId = 'virtual:wxt-webextension-polyfill-disabled';

@@ -1,16 +1,16 @@
 import type * as vite from 'vite';
-import { ResolvedConfig } from '~/types';
+import { InternalConfig } from '~/types';
 import { getGlobals } from '~/core/utils/globals';

 export function globals(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.PluginOption {
  return {
    name: 'wxt:globals',
    config() {
      const define: vite.InlineConfig['define'] = {};
      for (const global of getGlobals(config)) {
-        define[`import.meta.env.${global.name}`] = JSON.stringify(global.value);
+        define[global.name] = JSON.stringify(global.value);
      }
      return {
        define,
@@ -12,4 +12,3 @@ export * from './globals';
 export * from './webextensionPolyfillMock';
 export * from './excludeBrowserPolyfill';
 export * from './entrypointGroupGlobals';
-export * from './defineImportMeta';
@@ -1,5 +1,5 @@
 import type * as vite from 'vite';
-import { Entrypoint, ResolvedConfig } from '~/types';
+import { Entrypoint, InternalConfig } from '~/types';
 import { dirname, extname, resolve, join } from 'node:path';
 import { getEntrypointBundlePath } from '~/core/utils/entrypoints';
 import fs, { ensureDir } from 'fs-extra';
@@ -20,7 +20,7 @@ import { normalizePath } from '~/core/utils/paths';
 */
 export function multipageMove(
  entrypoints: Entrypoint[],
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.Plugin {
  return {
    name: 'wxt:multipage-move',
@@ -1,8 +1,8 @@
-import { ResolvedConfig } from '~/types';
+import { InternalConfig } from '~/types';
 import type * as vite from 'vite';

 export function tsconfigPaths(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.Plugin {
  return {
    name: 'wxt:aliases',
@@ -1,5 +1,6 @@
 import { createUnimport } from 'unimport';
-import { ResolvedConfig } from '~/types';
+import { InternalConfig } from '~/types';
+import { getUnimportOptions } from '~/core/utils/unimport';
 import type * as vite from 'vite';
 import { extname } from 'path';

@@ -16,9 +17,9 @@ const ENABLED_EXTENSIONS = new Set([
 * Inject any global imports defined by unimport
 */
 export function unimport(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.PluginOption {
-  const options = config.imports;
+  const options = getUnimportOptions(config);
  if (options === false) return [];

  const unimport = createUnimport(options);
@@ -35,11 +36,7 @@ export function unimport(
      // Don't transform non-js files
      if (!ENABLED_EXTENSIONS.has(extname(id))) return;

-      const injected = await unimport.injectImports(code, id);
-      return {
-        code: injected.code,
-        map: injected.s.generateMap({ hires: 'boundary', source: id }),
-      };
+      return unimport.injectImports(code, id);
    },
  };
 }
@@ -1,5 +1,5 @@
 import { Plugin } from 'vite';
-import { ResolvedConfig, VirtualEntrypointType } from '~/types';
+import { InternalConfig, VirtualEntrypointType } from '~/types';
 import fs from 'fs-extra';
 import { resolve } from 'path';
 import { normalizePath } from '~/core/utils/paths';
@@ -9,7 +9,7 @@ import { normalizePath } from '~/core/utils/paths';
 */
 export function virtualEntrypoint(
  type: VirtualEntrypointType,
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): Plugin {
  const virtualId = `virtual:wxt-${type}?`;
  const resolvedVirtualId = `\0${virtualId}`;
@@ -1,6 +1,6 @@
 import path from 'node:path';
 import type * as vite from 'vite';
-import { ResolvedConfig } from '~/types';
+import { InternalConfig } from '~/types';

 /**
 * Mock `webextension-polyfill` by inlining all dependencies that import it and adding a custom
@@ -16,7 +16,7 @@ import { ResolvedConfig } from '~/types';
 * `npm list` and inline them automatically.
 */
 export function webextensionPolyfillMock(
-  config: Omit<ResolvedConfig, 'builder'>,
+  config: Omit<InternalConfig, 'builder'>,
 ): vite.PluginOption {
  return {
    name: 'wxt:testing-inline-deps',
@@ -2,12 +2,14 @@ import {
  BuildStepOutput,
  EntrypointGroup,
  InlineConfig,
+  InternalConfig,
  ServerInfo,
  WxtDevServer,
 } from '~/types';
 import {
  getEntrypointBundlePath,
-  isHtmlEntrypoint,
+  getEntrypointOutputFile,
+  resolvePerBrowserOption,
 } from '~/core/utils/entrypoints';
 import {
  getContentScriptCssFiles,
@@ -15,6 +17,7 @@ import {
 } from '~/core/utils/manifest';
 import {
  internalBuild,
+  getInternalConfig,
  detectDevChanges,
  rebuild,
  findEntrypoints,
@@ -24,9 +27,6 @@ import { consola } from 'consola';
 import { Mutex } from 'async-mutex';
 import pc from 'picocolors';
 import { relative } from 'node:path';
-import { registerWxt, wxt } from './wxt';
-import { unnormalizePath } from './utils/paths';
-import { mapWxtOptionsToRegisteredContentScript } from './utils/content-scripts';

 /**
 * Creates a dev server and pre-builds all the files that need to exist before loading the extension.
@@ -49,60 +49,28 @@ export async function createServer(
    origin,
  };

-  const buildAndOpenBrowser = async () => {
-    // Build after starting the dev server so it can be used to transform HTML files
-    server.currentOutput = await internalBuild();
-
-    // Add file watchers for files not loaded by the dev server. See
-    // https://github.com/wxt-dev/wxt/issues/428#issuecomment-1944731870
-    try {
-      server.watcher.add(getExternalOutputDependencies(server));
-    } catch (err) {
-      wxt.config.logger.warn('Failed to register additional file paths:', err);
-    }
-
-    // Open browser after everything is ready to go.
-    await runner.openBrowser();
-  };
-
-  /**
-   * Stops the previous runner, grabs the latest config, and recreates the runner.
-   */
-  const closeAndRecreateRunner = async () => {
-    await runner.closeBrowser();
-    await wxt.reloadConfig();
-    runner = await createExtensionRunner();
-  };
-
  // Server instance must be created first so its reference can be added to the internal config used
  // to pre-render entrypoints
  const server: WxtDevServer = {
    ...serverInfo,
-    get watcher() {
-      return builderServer.watcher;
-    },
-    get ws() {
-      return builderServer.ws;
-    },
-    currentOutput: undefined,
+    watcher: undefined as any, // Filled out later down below
+    ws: undefined as any, // Filled out later down below
+    currentOutput: undefined as any, // Filled out later down below
    async start() {
      await builderServer.listen();
-      wxt.logger.success(`Started dev server @ ${serverInfo.origin}`);
-      await buildAndOpenBrowser();
-    },
-    async stop() {
-      await runner.closeBrowser();
-      await builderServer.close();
-    },
-    async restart() {
-      await closeAndRecreateRunner();
-      await buildAndOpenBrowser();
+      config.logger.success(`Started dev server @ ${serverInfo.origin}`);
+
+      // Build after starting the dev server so it can be used to transform HTML files
+      server.currentOutput = await internalBuild(config);
+
+      // Open browser after everything is ready to go.
+      await runner.openBrowser(config);
    },
    transformHtml(url, html, originalUrl) {
      return builderServer.transformHtml(url, html, originalUrl);
    },
-    reloadContentScript(payload) {
-      server.ws.send('wxt:reload-content-script', payload);
+    reloadContentScript(contentScript) {
+      server.ws.send('wxt:reload-content-script', contentScript);
    },
    reloadPage(path) {
      server.ws.send('wxt:reload-page', path);
@@ -110,28 +78,34 @@ export async function createServer(
    reloadExtension() {
      server.ws.send('wxt:reload-extension');
    },
-    async restartBrowser() {
-      await closeAndRecreateRunner();
-      await runner.openBrowser();
-    },
  };

-  await registerWxt('serve', inlineConfig, server);
+  const getLatestConfig = () =>
+    getInternalConfig(inlineConfig ?? {}, 'serve', server);
+  let config = await getLatestConfig();

-  let [runner, builderServer] = await Promise.all([
-    createExtensionRunner(),
-    wxt.config.builder.createServer(server),
+  const [runner, builderServer] = await Promise.all([
+    createExtensionRunner(config),
+    config.builder.createServer(server),
  ]);

+  server.watcher = builderServer.watcher;
+  server.ws = builderServer.ws;
+
  // Register content scripts for the first time after the background starts up since they're not
  // listed in the manifest
  server.ws.on('wxt:background-initialized', () => {
-    if (server.currentOutput == null) return;
-    reloadContentScripts(server.currentOutput.steps, server);
+    reloadContentScripts(server.currentOutput.steps, config, server);
  });

  // Listen for file changes and reload different parts of the extension accordingly
-  const reloadOnChange = createFileReloader(server);
+  const reloadOnChange = createFileReloader({
+    server,
+    getLatestConfig,
+    updateConfig(newConfig) {
+      config = newConfig;
+    },
+  });
  server.watcher.on('all', reloadOnChange);

  return server;
@@ -146,50 +120,49 @@ async function getPort(): Promise<number> {
 * Returns a function responsible for reloading different parts of the extension when a file
 * changes.
 */
-function createFileReloader(server: WxtDevServer) {
+function createFileReloader(options: {
+  server: WxtDevServer;
+  getLatestConfig: () => Promise<InternalConfig>;
+  updateConfig: (config: InternalConfig) => void;
+}) {
+  const { server, getLatestConfig, updateConfig } = options;
  const fileChangedMutex = new Mutex();
  const changeQueue: Array<[string, string]> = [];

  return async (event: string, path: string) => {
-    await wxt.reloadConfig();
+    const config = await getLatestConfig();
+    updateConfig(config);

    // Here, "path" is a non-normalized path (ie: C:\\users\\... instead of C:/users/...)
-    if (path.startsWith(wxt.config.outBaseDir)) return;
+    if (path.startsWith(config.outBaseDir)) return;
    changeQueue.push([event, path]);

    await fileChangedMutex.runExclusive(async () => {
-      if (server.currentOutput == null) return;
-
-      const fileChanges = changeQueue
-        .splice(0, changeQueue.length)
-        .map(([_, file]) => file);
+      const fileChanges = changeQueue.splice(0, changeQueue.length);
      if (fileChanges.length === 0) return;

      const changes = detectDevChanges(fileChanges, server.currentOutput);
      if (changes.type === 'no-change') return;

-      if (changes.type === 'full-restart') {
-        wxt.logger.info('Config changed, restarting server...');
-        server.restart();
-        return;
-      }
-
-      if (changes.type === 'browser-restart') {
-        wxt.logger.info('Runner config changed, restarting browser...');
-        server.restartBrowser();
-        return;
-      }
-
      // Log the entrypoints that were effected
-      wxt.logger.info(
-        `Changed: ${Array.from(new Set(fileChanges))
-          .map((file) => pc.dim(relative(wxt.config.root, file)))
+      config.logger.info(
+        `Changed: ${Array.from(new Set(fileChanges.map((change) => change[1])))
+          .map((file) => pc.dim(relative(config.root, file)))
          .join(', ')}`,
      );
+      const rebuiltNames = changes.rebuildGroups
+        .flat()
+        .map((entry) => {
+          return pc.cyan(
+            relative(config.outDir, getEntrypointOutputFile(entry, '')),
+          );
+        })
+        .join(pc.dim(', '));

      // Rebuild entrypoints on change
-      const allEntrypoints = await findEntrypoints();
+      const allEntrypoints = await findEntrypoints(config);
      const { output: newOutput } = await rebuild(
+        config,
        allEntrypoints,
        // TODO: this excludes new entrypoints, so they're not built until the dev command is restarted
        changes.rebuildGroups,
@@ -201,23 +174,15 @@ function createFileReloader(server: WxtDevServer) {
      switch (changes.type) {
        case 'extension-reload':
          server.reloadExtension();
-          consola.success(`Reloaded extension`);
          break;
        case 'html-reload':
-          const { reloadedNames } = reloadHtmlPages(
-            changes.rebuildGroups,
-            server,
-          );
-          consola.success(`Reloaded: ${getFilenameList(reloadedNames)}`);
+          reloadHtmlPages(changes.rebuildGroups, server, config);
          break;
        case 'content-script-reload':
-          reloadContentScripts(changes.changedSteps, server);
-          const rebuiltNames = changes.rebuildGroups
-            .flat()
-            .map((entry) => entry.name);
-          consola.success(`Reloaded: ${getFilenameList(rebuiltNames)}`);
+          reloadContentScripts(changes.changedSteps, config, server);
          break;
      }
+      consola.success(`Reloaded: ${rebuiltNames}`);
    });
  };
 }
@@ -225,25 +190,35 @@ function createFileReloader(server: WxtDevServer) {
 /**
 * From the server, tell the client to reload content scripts from the provided build step outputs.
 */
-function reloadContentScripts(steps: BuildStepOutput[], server: WxtDevServer) {
-  if (wxt.config.manifestVersion === 3) {
+function reloadContentScripts(
+  steps: BuildStepOutput[],
+  config: InternalConfig,
+  server: WxtDevServer,
+) {
+  if (config.manifestVersion === 3) {
    steps.forEach((step) => {
-      if (server.currentOutput == null) return;
-
      const entry = step.entrypoints;
      if (Array.isArray(entry) || entry.type !== 'content-script') return;

-      const js = [getEntrypointBundlePath(entry, wxt.config.outDir, '.js')];
+      const js = [getEntrypointBundlePath(entry, config.outDir, '.js')];
      const cssMap = getContentScriptsCssMap(server.currentOutput, [entry]);
      const css = getContentScriptCssFiles([entry], cssMap);

      server.reloadContentScript({
-        registration: entry.options.registration,
-        contentScript: mapWxtOptionsToRegisteredContentScript(
-          entry.options,
-          js,
-          css,
+        allFrames: resolvePerBrowserOption(
+          entry.options.allFrames,
+          config.browser,
        ),
+        excludeMatches: resolvePerBrowserOption(
+          entry.options.excludeMatches,
+          config.browser,
+        ),
+        matches: resolvePerBrowserOption(entry.options.matches, config.browser),
+        runAt: resolvePerBrowserOption(entry.options.runAt, config.browser),
+        // @ts-expect-error: Chrome accepts this, not typed in webextension-polyfill (https://developer.chrome.com/docs/extensions/reference/scripting/#type-RegisteredContentScript)
+        world: resolvePerBrowserOption(entry.options.world, config.browser),
+        js,
+        css,
      });
    });
  } else {
@@ -254,51 +229,10 @@ function reloadContentScripts(steps: BuildStepOutput[], server: WxtDevServer) {
 function reloadHtmlPages(
  groups: EntrypointGroup[],
  server: WxtDevServer,
-): { reloadedNames: string[] } {
-  // groups might contain other files like background/content scripts, and we only care about the HTMl pages
-  const htmlEntries = groups.flat().filter(isHtmlEntrypoint);
-
-  htmlEntries.forEach((entry) => {
-    const path = getEntrypointBundlePath(entry, wxt.config.outDir, '.html');
+  config: InternalConfig,
+) {
+  groups.flat().forEach((entry) => {
+    const path = getEntrypointBundlePath(entry, config.outDir, '.html');
    server.reloadPage(path);
  });
-
-  return {
-    reloadedNames: htmlEntries.map((entry) => entry.name),
-  };
-}
-
-function getFilenameList(names: string[]): string {
-  return names
-    .map((name) => {
-      return pc.cyan(name);
-    })
-    .join(pc.dim(', '));
-}
-
-/**
- * Based on the current build output, return a list of files that are:
- * 1. Not in node_modules
- * 2. Not inside project root
- */
-function getExternalOutputDependencies(server: WxtDevServer) {
-  return (
-    server.currentOutput?.steps
-      .flatMap((step, i) => {
-        if (Array.isArray(step.entrypoints) && i === 0) {
-          // Dev server is already watching all HTML/esm files
-          return [];
-        }
-
-        return step.chunks.flatMap((chunk) => {
-          if (chunk.type === 'asset') return [];
-          return chunk.moduleIds;
-        });
-      })
-      .filter(
-        (file) => !file.includes('node_modules') && !file.startsWith('\x00'),
-      )
-      .map(unnormalizePath)
-      .filter((file) => !file.startsWith(wxt.config.root)) ?? []
-  );
 }
@@ -90,25 +90,26 @@ interface Template {

 async function listTemplates(): Promise<Template[]> {
  try {
-    const res = await fetch('https://ungh.cc/repos/wxt-dev/wxt/files/main');
+    const res = await fetch(
+      'https://api.github.com/repos/wxt-dev/wxt/contents/templates',
+      {
+        headers: {
+          Accept: 'application/vnd.github+json',
+          'X-GitHub-Api-Version': '2022-11-28',
+        },
+      },
+    );
    if (res.status >= 300)
      throw Error(`Request failed with status ${res.status} ${res.statusText}`);

-    const data = (await res.json()) as {
-      meta: {
-        sha: string;
-      };
-      files: Array<{
-        path: string;
-        mode: string;
-        sha: string;
-        size: number;
-      }>;
-    };
-    return data.files
-      .map((item) => item.path.match(/templates\/(.+)\/package\.json/)?.[1])
-      .filter((name) => name != null)
-      .map((name) => ({ name: name!, path: `templates/${name}` }))
+    const data = (await res.json()) as Array<{
+      type: 'file' | 'dir';
+      name: string;
+      path: string;
+    }>;
+    return data
+      .filter((item: any) => item.type === 'dir')
+      .map((item) => ({ name: item.name, path: item.path }))
      .sort((l, r) => {
        const lWeight = TEMPLATE_SORT_WEIGHT[l.name] ?? Number.MAX_SAFE_INTEGER;
        const rWeight = TEMPLATE_SORT_WEIGHT[r.name] ?? Number.MAX_SAFE_INTEGER;
@@ -1,11 +1,15 @@
 import { InlineConfig } from '~/types';
-import { findEntrypoints, generateTypesDir } from '~/core/utils/building';
-import { registerWxt, wxt } from './wxt';
+import {
+  findEntrypoints,
+  generateTypesDir,
+  getInternalConfig,
+} from '~/core/utils/building';

 export async function prepare(config: InlineConfig) {
-  await registerWxt('build', config);
-  wxt.logger.info('Generating types...');
+  const internalConfig = await getInternalConfig(config, 'build');

-  const entrypoints = await findEntrypoints();
-  await generateTypesDir(entrypoints);
+  internalConfig.logger.info('Generating types...');
+
+  const entrypoints = await findEntrypoints(internalConfig);
+  await generateTypesDir(entrypoints, internalConfig);
 }
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from 'vitest';
 import { createExtensionRunner } from '..';
-import { setFakeWxt } from '~/core/utils/testing/fake-objects';
+import { fakeInternalConfig } from '~/core/utils/testing/fake-objects';
 import { mock } from 'vitest-mock-extended';
 import { createSafariRunner } from '../safari';
 import { createWslRunner } from '../wsl';
@@ -26,62 +26,54 @@ const createWebExtRunnerMock = vi.mocked(createWebExtRunner);

 describe('createExtensionRunner', () => {
  it('should return a Safari runner when browser is "safari"', async () => {
-    setFakeWxt({
-      config: {
-        browser: 'safari',
-      },
+    const config = fakeInternalConfig({
+      browser: 'safari',
    });
    const safariRunner = mock<ExtensionRunner>();
    createSafariRunnerMock.mockReturnValue(safariRunner);

-    await expect(createExtensionRunner()).resolves.toBe(safariRunner);
+    await expect(createExtensionRunner(config)).resolves.toBe(safariRunner);
  });

  it('should return a WSL runner when `is-wsl` is true', async () => {
    isWslMock.mockResolvedValueOnce(true);
-    setFakeWxt({
-      config: {
-        browser: 'chrome',
-      },
+    const config = fakeInternalConfig({
+      browser: 'chrome',
    });
    const wslRunner = mock<ExtensionRunner>();
    createWslRunnerMock.mockReturnValue(wslRunner);

-    await expect(createExtensionRunner()).resolves.toBe(wslRunner);
+    await expect(createExtensionRunner(config)).resolves.toBe(wslRunner);
  });

  it('should return a manual runner when `runner.disabled` is true', async () => {
    isWslMock.mockResolvedValueOnce(false);
-    setFakeWxt({
-      config: {
-        browser: 'chrome',
-        runnerConfig: {
-          config: {
-            disabled: true,
-          },
+    const config = fakeInternalConfig({
+      browser: 'chrome',
+      runnerConfig: {
+        config: {
+          disabled: true,
        },
      },
    });
    const manualRunner = mock<ExtensionRunner>();
    createManualRunnerMock.mockReturnValue(manualRunner);

-    await expect(createExtensionRunner()).resolves.toBe(manualRunner);
+    await expect(createExtensionRunner(config)).resolves.toBe(manualRunner);
  });

  it('should return a web-ext runner otherwise', async () => {
-    setFakeWxt({
-      config: {
-        browser: 'chrome',
-        runnerConfig: {
-          config: {
-            disabled: undefined,
-          },
+    const config = fakeInternalConfig({
+      browser: 'chrome',
+      runnerConfig: {
+        config: {
+          disabled: undefined,
        },
      },
    });
    const manualRunner = mock<ExtensionRunner>();
    createWebExtRunnerMock.mockReturnValue(manualRunner);

-    await expect(createExtensionRunner()).resolves.toBe(manualRunner);
+    await expect(createExtensionRunner(config)).resolves.toBe(manualRunner);
  });
 });
@@ -1,16 +1,17 @@
-import { ExtensionRunner } from '~/types';
+import { InternalConfig, ExtensionRunner } from '~/types';
 import { createWslRunner } from './wsl';
 import { createWebExtRunner } from './web-ext';
 import { createSafariRunner } from './safari';
 import { createManualRunner } from './manual';
 import { isWsl } from '~/core/utils/wsl';
-import { wxt } from '../wxt';

-export async function createExtensionRunner(): Promise<ExtensionRunner> {
-  if (wxt.config.browser === 'safari') return createSafariRunner();
+export async function createExtensionRunner(
+  config: InternalConfig,
+): Promise<ExtensionRunner> {
+  if (config.browser === 'safari') return createSafariRunner();

  if (await isWsl()) return createWslRunner();
-  if (wxt.config.runnerConfig.config?.disabled) return createManualRunner();
+  if (config.runnerConfig.config?.disabled) return createManualRunner();

  return createWebExtRunner();
 }
@@ -1,17 +1,16 @@
 import { ExtensionRunner } from '~/types';
 import { relative } from 'node:path';
-import { wxt } from '../wxt';

 /**
 * The manual runner tells the user to load the unpacked extension manually.
 */
 export function createManualRunner(): ExtensionRunner {
  return {
-    async openBrowser() {
-      wxt.logger.info(
+    async openBrowser(config) {
+      config.logger.info(
        `Load "${relative(
          process.cwd(),
-          wxt.config.outDir,
+          config.outDir,
        )}" as an unpacked extension manually`,
      );
    },
@@ -1,17 +1,16 @@
 import { ExtensionRunner } from '~/types';
 import { relative } from 'node:path';
-import { wxt } from '../wxt';

 /**
 * The Safari runner just logs a warning message because `web-ext` doesn't work with Safari.
 */
 export function createSafariRunner(): ExtensionRunner {
  return {
-    async openBrowser() {
-      wxt.logger.warn(
+    async openBrowser(config) {
+      config.logger.warn(
        `Cannot Safari using web-ext. Load "${relative(
          process.cwd(),
-          wxt.config.outDir,
+          config.outDir,
        )}" as an unpacked extension manually`,
      );
    },
@@ -1,8 +1,5 @@
 import type { WebExtRunInstance } from 'web-ext-run';
 import { ExtensionRunner } from '~/types';
-import { formatDuration } from '../utils/time';
-import defu from 'defu';
-import { wxt } from '../wxt';

 /**
 * Create an `ExtensionRunner` backed by `web-ext`.
@@ -11,31 +8,28 @@ export function createWebExtRunner(): ExtensionRunner {
  let runner: WebExtRunInstance | undefined;

  return {
-    async openBrowser() {
-      const startTime = Date.now();
+    async openBrowser(config) {
+      config.logger.info('Opening browser...');

-      if (
-        wxt.config.browser === 'firefox' &&
-        wxt.config.manifestVersion === 3
-      ) {
+      if (config.browser === 'firefox' && config.manifestVersion === 3) {
        throw Error(
          'Dev mode does not support Firefox MV3. For alternatives, see https://github.com/wxt-dev/wxt/issues/230#issuecomment-1806881653',
        );
      }

-      // Use WXT's logger instead of web-ext's built-in one.
+      // Use the plugin's logger instead of web-ext's built-in one.
      const webExtLogger = await import('web-ext-run/util/logger');
      webExtLogger.consoleStream.write = ({ level, msg, name }) => {
-        if (level >= ERROR_LOG_LEVEL) wxt.logger.error(name, msg);
-        if (level >= WARN_LOG_LEVEL) wxt.logger.warn(msg);
+        if (level >= ERROR_LOG_LEVEL) config.logger.error(name, msg);
+        if (level >= WARN_LOG_LEVEL) config.logger.warn(msg);
      };

-      const wxtUserConfig = wxt.config.runnerConfig.config;
+      const wxtUserConfig = config.runnerConfig.config;
      const userConfig = {
        console: wxtUserConfig?.openConsole,
        devtools: wxtUserConfig?.openDevtools,
        startUrl: wxtUserConfig?.startUrls,
-        ...(wxt.config.browser === 'firefox'
+        ...(config.browser === 'firefox'
          ? {
              firefox: wxtUserConfig?.binaries?.firefox,
              firefoxProfile: wxtUserConfig?.firefoxProfile,
@@ -43,21 +37,16 @@ export function createWebExtRunner(): ExtensionRunner {
              args: wxtUserConfig?.firefoxArgs,
            }
          : {
-              chromiumBinary: wxtUserConfig?.binaries?.[wxt.config.browser],
+              chromiumBinary: wxtUserConfig?.binaries?.[config.browser],
              chromiumProfile: wxtUserConfig?.chromiumProfile,
-              chromiumPref: defu(
-                wxtUserConfig?.chromiumPref,
-                DEFAULT_CHROMIUM_PREFS,
-              ),
              args: wxtUserConfig?.chromiumArgs,
            }),
      };

      const finalConfig = {
        ...userConfig,
-        target:
-          wxt.config.browser === 'firefox' ? 'firefox-desktop' : 'chromium',
-        sourceDir: wxt.config.outDir,
+        target: config.browser === 'firefox' ? 'firefox-desktop' : 'chromium',
+        sourceDir: config.outDir,
        // WXT handles reloads, so disable auto-reload behaviors in web-ext
        noReload: true,
        noInput: true,
@@ -66,14 +55,13 @@ export function createWebExtRunner(): ExtensionRunner {
        // Don't call `process.exit(0)` after starting web-ext
        shouldExitProgram: false,
      };
-      wxt.logger.debug('web-ext config:', finalConfig);
-      wxt.logger.debug('web-ext options:', options);
+      config.logger.debug('web-ext config:', finalConfig);
+      config.logger.debug('web-ext options:', options);

      const webExt = await import('web-ext-run');
      runner = await webExt.default.cmd.run(finalConfig, options);

-      const duration = Date.now() - startTime;
-      wxt.logger.success(`Opened browser in ${formatDuration(duration)}`);
+      config.logger.success('Opened!');
    },

    async closeBrowser() {
@@ -85,14 +73,3 @@ export function createWebExtRunner(): ExtensionRunner {
 // https://github.com/mozilla/web-ext/blob/e37e60a2738478f512f1255c537133321f301771/src/util/logger.js#L12
 const WARN_LOG_LEVEL = 40;
 const ERROR_LOG_LEVEL = 50;
-
-const DEFAULT_CHROMIUM_PREFS = {
-  devtools: {
-    synced_preferences_sync_disabled: {
-      // Remove content scripts from sourcemap debugger ignore list so stack traces
-      // and log locations show up properly, see:
-      // https://github.com/wxt-dev/wxt/issues/236#issuecomment-1915364520
-      skipContentScripts: false,
-    },
-  },
-};
@@ -1,17 +1,16 @@
 import { ExtensionRunner } from '~/types';
 import { relative } from 'node:path';
-import { wxt } from '../wxt';

 /**
 * The WSL runner just logs a warning message because `web-ext` doesn't work in WSL.
 */
 export function createWslRunner(): ExtensionRunner {
  return {
-    async openBrowser() {
-      wxt.logger.warn(
+    async openBrowser(config) {
+      config.logger.warn(
        `Cannot open browser when using WSL. Load "${relative(
          process.cwd(),
-          wxt.config.outDir,
+          config.outDir,
        )}" as an unpacked extension manually`,
      );
    },
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest';
-import { every, some } from '~/core/utils/arrays';
+import { every } from '~/core/utils/arrays';

 describe('Array Utils', () => {
  describe('every', () => {
@@ -15,20 +15,4 @@ describe('Array Utils', () => {
      expect(every([1, 2, 1], (item) => item === 1)).toBe(false);
    });
  });
-
-  describe('some', () => {
-    it('should return true if one value returns true', () => {
-      const array = [1, 2, 3];
-      const predicate = (item: number) => item === 2;
-
-      expect(some(array, predicate)).toBe(true);
-    });
-
-    it('should return false if no values match', () => {
-      const array = [1, 2, 3];
-      const predicate = (item: number) => item === 4;
-
-      expect(some(array, predicate)).toBe(false);
-    });
-  });
 });
@@ -1,15 +1,14 @@
-import { describe, expect, it, beforeEach } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { hashContentScriptOptions } from '~/core/utils/content-scripts';
-import { setFakeWxt } from '~/core/utils/testing/fake-objects';
+import { fakeInternalConfig } from '~/core/utils/testing/fake-objects';

 describe('Content Script Utils', () => {
-  beforeEach(() => {
-    setFakeWxt();
-  });
-
  describe('hashContentScriptOptions', () => {
    it('should return a string containing all the options with defaults applied', () => {
-      const hash = hashContentScriptOptions({ matches: [] });
+      const hash = hashContentScriptOptions(
+        { matches: [] },
+        fakeInternalConfig(),
+      );

      expect(hash).toMatchInlineSnapshot(
        `"[["all_frames",false],["exclude_globs",[]],["exclude_matches",[]],["include_globs",[]],["match_about_blank",false],["match_origin_as_fallback",false],["matches",[]],["run_at","document_idle"],["world","ISOLATED"]]"`,
@@ -17,15 +16,21 @@ describe('Content Script Utils', () => {
    });

    it('should be consistent regardless of the object ordering and default values', () => {
-      const hash1 = hashContentScriptOptions({
-        allFrames: true,
-        matches: ['*://google.com/*', '*://duckduckgo.com/*'],
-        matchAboutBlank: false,
-      });
-      const hash2 = hashContentScriptOptions({
-        matches: ['*://duckduckgo.com/*', '*://google.com/*'],
-        allFrames: true,
-      });
+      const hash1 = hashContentScriptOptions(
+        {
+          allFrames: true,
+          matches: ['*://google.com/*', '*://duckduckgo.com/*'],
+          matchAboutBlank: false,
+        },
+        fakeInternalConfig(),
+      );
+      const hash2 = hashContentScriptOptions(
+        {
+          matches: ['*://duckduckgo.com/*', '*://google.com/*'],
+          allFrames: true,
+        },
+        fakeInternalConfig(),
+      );

      expect(hash1).toBe(hash2);
    });
@@ -47,7 +47,6 @@ describe('Entrypoint Utils', () => {
        name,
        outputDir,
        options: {},
-        skipped: false,
      };

      const actual = getEntrypointOutputFile(entrypoint, ext);
@@ -1,6 +1,6 @@
 import { describe, it, expect } from 'vitest';
 import { getPackageJson } from '../package';
-import { setFakeWxt } from '../testing/fake-objects';
+import { fakeInternalConfig } from '../testing/fake-objects';
 import { mock } from 'vitest-mock-extended';
 import { Logger } from '~/types';

@@ -8,11 +8,7 @@ describe('Package JSON Utils', () => {
  describe('getPackageJson', () => {
    it('should return the package.json inside <root>/package.json', async () => {
      const root = process.cwd(); // WXT project directory
-      setFakeWxt({
-        config: { root },
-      });
-
-      const actual = await getPackageJson();
+      const actual = await getPackageJson(fakeInternalConfig({ root }));

      expect(actual).toMatchObject({
        name: 'wxt',
@@ -22,12 +18,7 @@ describe('Package JSON Utils', () => {
    it("should return an empty object when <root>/package.json doesn't exist", async () => {
      const root = '/some/path/that/does/not/exist';
      const logger = mock<Logger>();
-      setFakeWxt({
-        config: { root, logger },
-        logger,
-      });
-
-      const actual = await getPackageJson();
+      const actual = await getPackageJson(fakeInternalConfig({ root, logger }));

      expect(actual).toEqual({});
    });
@@ -1,7 +0,0 @@
-import { defineContentScript } from '~/sandbox';
-import { faker } from '@faker-js/faker';
-
-export default defineContentScript({
-  matches: [faker.string.nanoid()],
-  main() {},
-});
@@ -1,100 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import {
-  fakeArray,
-  fakeContentScriptEntrypoint,
-  fakeEntrypoint,
-  fakeGenericEntrypoint,
-} from '../testing/fake-objects';
-import { validateEntrypoints } from '../validation';
-
-describe('Validation Utils', () => {
-  describe('validateEntrypoints', () => {
-    it('should return no errors when there are no errors', () => {
-      const entrypoints = fakeArray(fakeEntrypoint);
-      const expected = {
-        errors: [],
-        errorCount: 0,
-        warningCount: 0,
-      };
-
-      const actual = validateEntrypoints(entrypoints);
-
-      expect(actual).toEqual(expected);
-    });
-
-    it('should return an error when exclude is not an array', () => {
-      const entrypoint = fakeGenericEntrypoint({
-        options: {
-          // @ts-expect-error
-          exclude: 0,
-        },
-      });
-      const expected = {
-        errors: [
-          {
-            type: 'error',
-            message: '`exclude` must be an array of browser names',
-            value: 0,
-            entrypoint,
-          },
-        ],
-        errorCount: 1,
-        warningCount: 0,
-      };
-
-      const actual = validateEntrypoints([entrypoint]);
-
-      expect(actual).toEqual(expected);
-    });
-
-    it('should return an error when include is not an array', () => {
-      const entrypoint = fakeGenericEntrypoint({
-        options: {
-          // @ts-expect-error
-          include: 0,
-        },
-      });
-      const expected = {
-        errors: [
-          {
-            type: 'error',
-            message: '`include` must be an array of browser names',
-            value: 0,
-            entrypoint,
-          },
-        ],
-        errorCount: 1,
-        warningCount: 0,
-      };
-
-      const actual = validateEntrypoints([entrypoint]);
-
-      expect(actual).toEqual(expected);
-    });
-
-    it("should return an error when content scripts don't have a matches", () => {
-      const entrypoint = fakeContentScriptEntrypoint({
-        options: {
-          // @ts-expect-error
-          matches: null,
-        },
-      });
-      const expected = {
-        errors: [
-          {
-            type: 'error',
-            message: '`matches` is required',
-            value: null,
-            entrypoint,
-          },
-        ],
-        errorCount: 1,
-        warningCount: 0,
-      };
-
-      const actual = validateEntrypoints([entrypoint]);
-
-      expect(actual).toEqual(expected);
-    });
-  });
-});
@@ -9,15 +9,3 @@ export function every<T>(
    if (!predicate(array[i], i)) return false;
  return true;
 }
-
-/**
- * Returns true when any of the predicates return true;
- */
-export function some<T>(
-  array: T[],
-  predicate: (item: T, index: number) => boolean,
-): boolean {
-  for (let i = 0; i < array.length; i++)
-    if (predicate(array[i], i)) return true;
-  return false;
-}
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { DevModeChange, detectDevChanges } from '~/core/utils/building';
 import {
  fakeBackgroundEntrypoint,
@@ -10,20 +10,22 @@ import {
  fakePopupEntrypoint,
  fakeOutputAsset,
  fakeOutputChunk,
-  fakeWxt,
-  setFakeWxt,
 } from '~/core/utils/testing/fake-objects';
 import { BuildOutput, BuildStepOutput } from '~/types';
-import { setWxtForTesting } from '../../../wxt';

 describe('Detect Dev Changes', () => {
-  beforeEach(() => {
-    setWxtForTesting(fakeWxt());
-  });
-
  describe('No changes', () => {
+    it("should return 'no-change' when a build hasn't finished", () => {
+      const actual = detectDevChanges(
+        [['unknown', '/path/to/file.ts']],
+        undefined,
+      );
+
+      expect(actual).toEqual({ type: 'no-change' });
+    });
+
    it("should return 'no-change' when the changed file isn't used by any of the entrypoints", () => {
-      const changes = ['/some/path.ts'];
+      const change: [string, string] = ['unknown', '/some/path.ts'];
      const currentOutput: BuildOutput = {
        manifest: fakeManifest(),
        publicAssets: [],
@@ -39,67 +41,18 @@ describe('Detect Dev Changes', () => {
        ],
      };

-      const actual = detectDevChanges(changes, currentOutput);
+      const actual = detectDevChanges([change], currentOutput);

      expect(actual).toEqual({ type: 'no-change' });
    });
  });

-  describe('wxt.config.ts', () => {
-    it("should return 'full-restart' when one of the changed files is the config file", () => {
-      const configFile = '/root/wxt.config.ts';
-      setFakeWxt({
-        config: {
-          userConfigMetadata: {
-            configFile,
-          },
-        },
-      });
-      const changes = ['/root/src/public/image.svg', configFile];
-      const currentOutput: BuildOutput = {
-        manifest: fakeManifest(),
-        publicAssets: [],
-        steps: [],
-      };
-      const expected: DevModeChange = {
-        type: 'full-restart',
-      };
-
-      const actual = detectDevChanges(changes, currentOutput);
-
-      expect(actual).toEqual(expected);
-    });
-  });
-
-  describe('web-ext.config.ts', () => {
-    it("should return 'browser-restart' when one of the changed files is the config file", () => {
-      const runnerFile = '/root/web-ext.config.ts';
-      setFakeWxt({
-        config: {
-          runnerConfig: {
-            configFile: runnerFile,
-          },
-        },
-      });
-      const changes = ['/root/src/public/image.svg', runnerFile];
-      const currentOutput: BuildOutput = {
-        manifest: fakeManifest(),
-        publicAssets: [],
-        steps: [],
-      };
-      const expected: DevModeChange = {
-        type: 'browser-restart',
-      };
-
-      const actual = detectDevChanges(changes, currentOutput);
-
-      expect(actual).toEqual(expected);
-    });
-  });
-
  describe('Public Assets', () => {
    it("should return 'extension-reload' without any groups to rebuild when the changed file is a public asset", () => {
-      const changes = ['/root/src/public/image.svg'];
+      const change: [string, string] = [
+        'unknown',
+        '/root/src/public/image.svg',
+      ];
      const asset1 = fakeOutputAsset({
        fileName: 'image.svg',
      });
@@ -120,7 +73,7 @@ describe('Detect Dev Changes', () => {
        },
      };

-      const actual = detectDevChanges(changes, currentOutput);
+      const actual = detectDevChanges([change], currentOutput);

      expect(actual).toEqual(expected);
    });
@@ -167,15 +120,18 @@ describe('Detect Dev Changes', () => {
        rebuildGroups: [background],
      };

-      const actual = detectDevChanges([changedPath], currentOutput);
+      const actual = detectDevChanges(
+        [['unknown', changedPath]],
+        currentOutput,
+      );

      expect(actual).toEqual(expected);
    });
  });

  describe('HTML Pages', () => {
-    it('should detect changes to entrypoints/<name>.html files', async () => {
-      const changedPath = '/root/page1.html';
+    it('should rebuild then reload only the effected pages', async () => {
+      const changedPath = '/root/page1/index.html';
      const htmlPage1 = fakePopupEntrypoint({
        inputPath: changedPath,
      });
@@ -190,16 +146,16 @@ describe('Detect Dev Changes', () => {
      const step1: BuildStepOutput = {
        entrypoints: [htmlPage1, htmlPage2],
        chunks: [
-          fakeOutputAsset({
-            fileName: 'page1.html',
+          fakeOutputChunk({
+            moduleIds: [fakeFile(), changedPath],
          }),
        ],
      };
      const step2: BuildStepOutput = {
        entrypoints: [htmlPage3],
        chunks: [
-          fakeOutputAsset({
-            fileName: 'page2.html',
+          fakeOutputChunk({
+            moduleIds: [fakeFile(), fakeFile(), fakeFile()],
          }),
        ],
      };
@@ -218,56 +174,10 @@ describe('Detect Dev Changes', () => {
        rebuildGroups: [[htmlPage1, htmlPage2]],
      };

-      const actual = detectDevChanges([changedPath], currentOutput);
-
-      expect(actual).toEqual(expected);
-    });
-
-    it('should detect changes to entrypoints/<name>/index.html files', async () => {
-      const changedPath = '/root/page1/index.html';
-      const htmlPage1 = fakePopupEntrypoint({
-        inputPath: changedPath,
-      });
-      const htmlPage2 = fakeOptionsEntrypoint({
-        inputPath: '/root/page2/index.html',
-      });
-      const htmlPage3 = fakeGenericEntrypoint({
-        type: 'sandbox',
-        inputPath: '/root/page3/index.html',
-      });
-
-      const step1: BuildStepOutput = {
-        entrypoints: [htmlPage1, htmlPage2],
-        chunks: [
-          fakeOutputAsset({
-            fileName: 'page1.html',
-          }),
-        ],
-      };
-      const step2: BuildStepOutput = {
-        entrypoints: [htmlPage3],
-        chunks: [
-          fakeOutputAsset({
-            fileName: 'page2.html',
-          }),
-        ],
-      };
-
-      const currentOutput: BuildOutput = {
-        manifest: fakeManifest(),
-        publicAssets: [],
-        steps: [step1, step2],
-      };
-      const expected: DevModeChange = {
-        type: 'html-reload',
-        cachedOutput: {
-          ...currentOutput,
-          steps: [step2],
-        },
-        rebuildGroups: [[htmlPage1, htmlPage2]],
-      };
-
-      const actual = detectDevChanges([changedPath], currentOutput);
+      const actual = detectDevChanges(
+        [['unknown', changedPath]],
+        currentOutput,
+      );

      expect(actual).toEqual(expected);
    });
@@ -326,7 +236,10 @@ describe('Detect Dev Changes', () => {
        rebuildGroups: [script1, script3],
      };

-      const actual = detectDevChanges([changedPath], currentOutput);
+      const actual = detectDevChanges(
+        [['unknown', changedPath]],
+        currentOutput,
+      );

      expect(actual).toEqual(expected);
    });
@@ -1,23 +1,17 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { describe, it, expect, vi } from 'vitest';
 import {
  BackgroundEntrypoint,
-  BackgroundEntrypointOptions,
-  BaseEntrypointOptions,
  ContentScriptEntrypoint,
  GenericEntrypoint,
  OptionsEntrypoint,
  PopupEntrypoint,
-  SidepanelEntrypoint,
 } from '~/types';
 import { resolve } from 'path';
 import { findEntrypoints } from '../find-entrypoints';
 import fs from 'fs-extra';
 import { importEntrypointFile } from '../import-entrypoint';
 import glob from 'fast-glob';
-import {
-  fakeResolvedConfig,
-  setFakeWxt,
-} from '~/core/utils/testing/fake-objects';
+import { fakeInternalConfig } from '~/core/utils/testing/fake-objects';
 import { unnormalizePath } from '~/core/utils/paths';

 vi.mock('../import-entrypoint');
@@ -32,18 +26,13 @@ const readFileMock = vi.mocked(
 );

 describe('findEntrypoints', () => {
-  const config = fakeResolvedConfig({
-    manifestVersion: 3,
+  const config = fakeInternalConfig({
    root: '/',
    entrypointsDir: resolve('/src/entrypoints'),
    outDir: resolve('.output'),
    command: 'build',
  });

-  beforeEach(() => {
-    setFakeWxt({ config });
-  });
-
  it.each<[string, string, PopupEntrypoint]>([
    [
      'popup.html',
@@ -64,7 +53,6 @@ describe('findEntrypoints', () => {
          defaultIcon: { '16': '/icon/16.png' },
          defaultTitle: 'Default Title',
        },
-        skipped: false,
      },
    ],
    [
@@ -84,7 +72,6 @@ describe('findEntrypoints', () => {
        options: {
          defaultTitle: 'Title',
        },
-        skipped: false,
      },
    ],
  ])(
@@ -93,7 +80,7 @@ describe('findEntrypoints', () => {
      globMock.mockResolvedValueOnce([path]);
      readFileMock.mockResolvedValueOnce(content);

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toHaveLength(1);
      expect(entrypoints[0]).toEqual(expected);
@@ -116,7 +103,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'options.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -137,7 +123,6 @@ describe('findEntrypoints', () => {
        options: {
          openInTab: true,
        },
-        skipped: false,
      },
    ],
  ])(
@@ -146,7 +131,7 @@ describe('findEntrypoints', () => {
      globMock.mockResolvedValueOnce([path]);
      readFileMock.mockResolvedValueOnce(content);

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toHaveLength(1);
      expect(entrypoints[0]).toEqual(expected);
@@ -161,7 +146,6 @@ describe('findEntrypoints', () => {
        name: 'content',
        inputPath: resolve(config.entrypointsDir, 'content.ts'),
        outputDir: resolve(config.outDir, 'content-scripts'),
-        skipped: false,
      },
    ],
    [
@@ -171,7 +155,6 @@ describe('findEntrypoints', () => {
        name: 'overlay',
        inputPath: resolve(config.entrypointsDir, 'overlay.content.ts'),
        outputDir: resolve(config.outDir, 'content-scripts'),
-        skipped: false,
      },
    ],
    [
@@ -181,7 +164,6 @@ describe('findEntrypoints', () => {
        name: 'content',
        inputPath: resolve(config.entrypointsDir, 'content/index.ts'),
        outputDir: resolve(config.outDir, 'content-scripts'),
-        skipped: false,
      },
    ],
    [
@@ -191,7 +173,6 @@ describe('findEntrypoints', () => {
        name: 'overlay',
        inputPath: resolve(config.entrypointsDir, 'overlay.content/index.ts'),
        outputDir: resolve(config.outDir, 'content-scripts'),
-        skipped: false,
      },
    ],
    [
@@ -201,7 +182,6 @@ describe('findEntrypoints', () => {
        name: 'overlay',
        inputPath: resolve(config.entrypointsDir, 'overlay.content.tsx'),
        outputDir: resolve(config.outDir, 'content-scripts'),
-        skipped: false,
      },
    ],
  ])(
@@ -213,11 +193,14 @@ describe('findEntrypoints', () => {
      globMock.mockResolvedValueOnce([path]);
      importEntrypointFileMock.mockResolvedValue(options);

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toHaveLength(1);
      expect(entrypoints[0]).toEqual({ ...expected, options });
-      expect(importEntrypointFileMock).toBeCalledWith(expected.inputPath);
+      expect(importEntrypointFileMock).toBeCalledWith(
+        expected.inputPath,
+        config,
+      );
    },
  );

@@ -229,7 +212,6 @@ describe('findEntrypoints', () => {
        name: 'background',
        inputPath: resolve(config.entrypointsDir, 'background.ts'),
        outputDir: config.outDir,
-        skipped: false,
      },
    ],
    [
@@ -239,144 +221,35 @@ describe('findEntrypoints', () => {
        name: 'background',
        inputPath: resolve(config.entrypointsDir, 'background/index.ts'),
        outputDir: config.outDir,
-        skipped: false,
      },
    ],
  ])(
    'should find and load background entrypoint config from %s',
    async (path, expected) => {
-      const options: BackgroundEntrypointOptions = {
+      const options: BackgroundEntrypoint['options'] = {
        type: 'module',
      };
      globMock.mockResolvedValueOnce([path]);
      importEntrypointFileMock.mockResolvedValue(options);

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toHaveLength(1);
      expect(entrypoints[0]).toEqual({ ...expected, options });
-      expect(importEntrypointFileMock).toBeCalledWith(expected.inputPath);
+      expect(importEntrypointFileMock).toBeCalledWith(
+        expected.inputPath,
+        config,
+      );
    },
  );

-  it.each<[string, string, SidepanelEntrypoint]>([
-    [
-      'sidepanel.html',
-      `
-        <html>
-          <head>
-            <title>Default Title</title>
-            <meta name="manifest.default_icon" content="{ '16': '/icon/16.png' }" />
-            <meta name="manifest.open_at_install" content="true" />
-          </head>
-        </html>
-      `,
-      {
-        type: 'sidepanel',
-        name: 'sidepanel',
-        inputPath: resolve(config.entrypointsDir, 'sidepanel.html'),
-        outputDir: config.outDir,
-        options: {
-          defaultTitle: 'Default Title',
-          defaultIcon: { '16': '/icon/16.png' },
-          openAtInstall: true,
-        },
-        skipped: false,
-      },
-    ],
-    [
-      'sidepanel/index.html',
-      `<html></html>`,
-      {
-        type: 'sidepanel',
-        name: 'sidepanel',
-        inputPath: resolve(config.entrypointsDir, 'sidepanel/index.html'),
-        options: {},
-        outputDir: config.outDir,
-        skipped: false,
-      },
-    ],
-    [
-      'named.sidepanel.html',
-      `<html></html>`,
-      {
-        type: 'sidepanel',
-        name: 'named',
-        inputPath: resolve(config.entrypointsDir, 'named.sidepanel.html'),
-        options: {},
-        outputDir: config.outDir,
-        skipped: false,
-      },
-    ],
-    [
-      'named.sidepanel/index.html',
-      `<html></html>`,
-      {
-        type: 'sidepanel',
-        name: 'named',
-        inputPath: resolve(config.entrypointsDir, 'named.sidepanel/index.html'),
-        outputDir: config.outDir,
-        options: {},
-        skipped: false,
-      },
-    ],
-  ])(
-    'should find and load sidepanel entrypoint config from %s',
-    async (path, content, expected) => {
-      globMock.mockResolvedValueOnce([path]);
-      readFileMock.mockResolvedValueOnce(content);
-
-      const entrypoints = await findEntrypoints();
-
-      expect(entrypoints).toHaveLength(1);
-      expect(entrypoints[0]).toEqual(expected);
-    },
-  );
-
-  it('should remove type=module from MV2 background scripts', async () => {
-    setFakeWxt({
-      config: {
-        manifestVersion: 2,
-      },
-    });
-    const options: BackgroundEntrypointOptions = {
-      type: 'module',
-    };
-    globMock.mockResolvedValueOnce(['background.ts']);
-    importEntrypointFileMock.mockResolvedValue(options);
-
-    const entrypoints = await findEntrypoints();
-
-    expect(entrypoints[0].options).toEqual({});
-  });
-
-  it('should allow type=module for MV3 background service workers', async () => {
-    setFakeWxt({
-      config: {
-        manifestVersion: 3,
-      },
-    });
-    const options: BackgroundEntrypointOptions = {
-      type: 'module',
-    };
-    globMock.mockResolvedValueOnce(['background.ts']);
-    importEntrypointFileMock.mockResolvedValue(options);
-
-    const entrypoints = await findEntrypoints();
-
-    expect(entrypoints[0].options).toEqual(options);
-  });
-
  it("should include a virtual background script so dev reloading works when there isn't a background entrypoint defined by the user", async () => {
-    setFakeWxt({
-      config: {
-        ...config,
-        command: 'serve',
-      },
-    });
    globMock.mockResolvedValueOnce(['popup.html']);

-    const entrypoints = await findEntrypoints();
+    const entrypoints = await findEntrypoints({
+      ...config,
+      command: 'serve',
+    });

    expect(entrypoints).toHaveLength(2);
    expect(entrypoints).toContainEqual({
@@ -385,7 +258,6 @@ describe('findEntrypoints', () => {
      name: 'background',
      options: {},
      outputDir: config.outDir,
-      skipped: false,
    });
  });

@@ -406,17 +278,19 @@ describe('findEntrypoints', () => {
        name: 'injected',
        inputPath: resolve(config.entrypointsDir, path),
        outputDir: config.outDir,
-        skipped: false,
      };
-      const options: BaseEntrypointOptions = {};
+      const options: GenericEntrypoint['options'] = {};
      globMock.mockResolvedValueOnce([path]);
      importEntrypointFileMock.mockResolvedValue(options);

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toHaveLength(1);
      expect(entrypoints[0]).toEqual({ ...expected, options });
-      expect(importEntrypointFileMock).toBeCalledWith(expected.inputPath);
+      expect(importEntrypointFileMock).toBeCalledWith(
+        expected.inputPath,
+        config,
+      );
    },
  );

@@ -430,7 +304,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'sandbox.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -441,7 +314,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'sandbox/index.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -452,7 +324,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'named.sandbox.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -463,7 +334,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'named.sandbox/index.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],

@@ -476,7 +346,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'bookmarks.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -487,7 +356,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'bookmarks/index.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],

@@ -500,7 +368,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'history.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -511,7 +378,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'history/index.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],

@@ -524,7 +390,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'newtab.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -535,7 +400,48 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'newtab/index.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
+      },
+    ],
+
+    // sidepanel
+    [
+      'sidepanel.html',
+      {
+        type: 'sidepanel',
+        name: 'sidepanel',
+        inputPath: resolve(config.entrypointsDir, 'sidepanel.html'),
+        outputDir: config.outDir,
+        options: {},
+      },
+    ],
+    [
+      'sidepanel/index.html',
+      {
+        type: 'sidepanel',
+        name: 'sidepanel',
+        inputPath: resolve(config.entrypointsDir, 'sidepanel/index.html'),
+        outputDir: config.outDir,
+        options: {},
+      },
+    ],
+    [
+      'named.sidepanel.html',
+      {
+        type: 'sidepanel',
+        name: 'named',
+        inputPath: resolve(config.entrypointsDir, 'named.sidepanel.html'),
+        outputDir: config.outDir,
+        options: {},
+      },
+    ],
+    [
+      'named.sidepanel/index.html',
+      {
+        type: 'sidepanel',
+        name: 'named',
+        inputPath: resolve(config.entrypointsDir, 'named.sidepanel/index.html'),
+        outputDir: config.outDir,
+        options: {},
      },
    ],

@@ -548,7 +454,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'devtools.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -559,7 +464,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'devtools/index.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],

@@ -572,7 +476,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'onboarding.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -583,7 +486,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'onboarding/index.html'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],

@@ -596,7 +498,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'iframe.scss'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -607,7 +508,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'iframe.css'),
        outputDir: config.outDir,
        options: {},
-        skipped: false,
      },
    ],

@@ -620,7 +520,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'content.css'),
        outputDir: resolve(config.outDir, 'content-scripts'),
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -631,7 +530,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'overlay.content.css'),
        outputDir: resolve(config.outDir, 'content-scripts'),
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -642,7 +540,6 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'content/index.css'),
        outputDir: resolve(config.outDir, 'content-scripts'),
        options: {},
-        skipped: false,
      },
    ],
    [
@@ -653,13 +550,12 @@ describe('findEntrypoints', () => {
        inputPath: resolve(config.entrypointsDir, 'overlay.content/index.css'),
        outputDir: resolve(config.outDir, 'content-scripts'),
        options: {},
-        skipped: false,
      },
    ],
  ])('should find entrypoint for %s', async (path, expected) => {
    globMock.mockResolvedValueOnce([path]);

-    const entrypoints = await findEntrypoints();
+    const entrypoints = await findEntrypoints(config);

    expect(entrypoints).toHaveLength(1);
    expect(entrypoints[0]).toEqual(expected);
@@ -675,7 +571,7 @@ describe('findEntrypoints', () => {
      'ui.html',
    ]);

-    await expect(() => findEntrypoints()).rejects.toThrowError(
+    await expect(() => findEntrypoints(config)).rejects.toThrowError(
      [
        'Multiple entrypoints with the same name detected, only one entrypoint for each name is allowed.',
        '',
@@ -693,7 +589,7 @@ describe('findEntrypoints', () => {
  it('throw an error if there are no entrypoints', async () => {
    globMock.mockResolvedValueOnce([]);

-    await expect(() => findEntrypoints()).rejects.toThrowError(
+    await expect(() => findEntrypoints(config)).rejects.toThrowError(
      `No entrypoints found in ${unnormalizePath(config.entrypointsDir)}`,
    );
  });
@@ -705,7 +601,7 @@ describe('findEntrypoints', () => {
        include: ['not' + config.browser],
      });

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -716,7 +612,7 @@ describe('findEntrypoints', () => {
        include: ['not' + config.browser],
      });

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -733,7 +629,7 @@ describe('findEntrypoints', () => {
        </html>`,
      );

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -750,7 +646,7 @@ describe('findEntrypoints', () => {
        </html>`,
      );

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -767,7 +663,7 @@ describe('findEntrypoints', () => {
        </html>`,
      );

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -780,7 +676,7 @@ describe('findEntrypoints', () => {
        exclude: [config.browser],
      });

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -791,7 +687,7 @@ describe('findEntrypoints', () => {
        exclude: [config.browser],
      });

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -806,7 +702,7 @@ describe('findEntrypoints', () => {
        </html>`,
      );

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -821,7 +717,7 @@ describe('findEntrypoints', () => {
        </html>`,
      );

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
@@ -836,36 +732,9 @@ describe('findEntrypoints', () => {
        </html>`,
      );

-      const entrypoints = await findEntrypoints();
+      const entrypoints = await findEntrypoints(config);

      expect(entrypoints).toEqual([]);
    });
  });
-
-  describe('filterEntrypoints option', () => {
-    it('should control entrypoints accessible', async () => {
-      globMock.mockResolvedValue([
-        'options/index.html',
-        'popup/index.html',
-        'ui.content/index.ts',
-        'injected.content/index.ts',
-      ]);
-      importEntrypointFileMock.mockResolvedValue({});
-      const filterEntrypoints = ['popup', 'ui'];
-      setFakeWxt({
-        config: {
-          root: '/',
-          entrypointsDir: resolve('/src/entrypoints'),
-          outDir: resolve('.output'),
-          command: 'build',
-          filterEntrypoints: new Set(filterEntrypoints),
-        },
-      });
-
-      const entrypoints = await findEntrypoints();
-      const names = entrypoints.map((item) => item.name);
-      expect(names).toHaveLength(2);
-      expect(names).toEqual(filterEntrypoints);
-    });
-  });
 });
@@ -1,11 +1,6 @@
 import { describe, expect, it } from 'vitest';
 import { Entrypoint } from '~/types';
 import { groupEntrypoints } from '../group-entrypoints';
-import {
-  fakeBackgroundEntrypoint,
-  fakeGenericEntrypoint,
-  fakePopupEntrypoint,
-} from '../../testing/fake-objects';

 const background: Entrypoint = {
  type: 'background',
@@ -13,7 +8,6 @@ const background: Entrypoint = {
  inputPath: '/background.ts',
  outputDir: '/.output/background',
  options: {},
-  skipped: false,
 };
 const contentScript: Entrypoint = {
  type: 'content-script',
@@ -23,7 +17,6 @@ const contentScript: Entrypoint = {
  options: {
    matches: ['<all_urls>'],
  },
-  skipped: false,
 };
 const unlistedScript: Entrypoint = {
  type: 'unlisted-script',
@@ -31,7 +24,6 @@ const unlistedScript: Entrypoint = {
  inputPath: '/injected.ts',
  outputDir: '/.output/injected',
  options: {},
-  skipped: false,
 };
 const popup: Entrypoint = {
  type: 'popup',
@@ -39,7 +31,6 @@ const popup: Entrypoint = {
  inputPath: '/popup.html',
  outputDir: '/.output/popup',
  options: {},
-  skipped: false,
 };
 const unlistedPage: Entrypoint = {
  type: 'unlisted-page',
@@ -47,7 +38,6 @@ const unlistedPage: Entrypoint = {
  inputPath: '/onboarding.html',
  outputDir: '/.output/onboarding',
  options: {},
-  skipped: false,
 };
 const options: Entrypoint = {
  type: 'options',
@@ -55,7 +45,6 @@ const options: Entrypoint = {
  inputPath: '/options.html',
  outputDir: '/.output/options',
  options: {},
-  skipped: false,
 };
 const sandbox1: Entrypoint = {
  type: 'sandbox',
@@ -63,7 +52,6 @@ const sandbox1: Entrypoint = {
  inputPath: '/sandbox1.html',
  outputDir: '/.output/sandbox1',
  options: {},
-  skipped: false,
 };
 const sandbox2: Entrypoint = {
  type: 'sandbox',
@@ -71,7 +59,6 @@ const sandbox2: Entrypoint = {
  inputPath: '/sandbox2.html',
  outputDir: '/.output/sandbox2',
  options: {},
-  skipped: false,
 };
 const unlistedStyle: Entrypoint = {
  type: 'unlisted-style',
@@ -79,7 +66,6 @@ const unlistedStyle: Entrypoint = {
  inputPath: '/injected.scss',
  outputDir: '/.output',
  options: {},
-  skipped: false,
 };
 const contentScriptStyle: Entrypoint = {
  type: 'content-script-style',
@@ -87,7 +73,6 @@ const contentScriptStyle: Entrypoint = {
  inputPath: '/overlay.content.scss',
  outputDir: '/.output/content-scripts',
  options: {},
-  skipped: false,
 };

 describe('groupEntrypoints', () => {
@@ -146,29 +131,4 @@ describe('groupEntrypoints', () => {

    expect(actual).toEqual(expected);
  });
-
-  it('should group ESM compatible scripts with extension pages', () => {
-    const background = fakeBackgroundEntrypoint({
-      options: {
-        type: 'module',
-      },
-    });
-    const popup = fakePopupEntrypoint();
-    const sandbox = fakeGenericEntrypoint({
-      inputPath: '/entrypoints/sandbox.html',
-      name: 'sandbox',
-      type: 'sandbox',
-    });
-
-    const actual = groupEntrypoints([background, popup, sandbox]);
-
-    expect(actual).toEqual([[background, popup], [sandbox]]);
-  });
-
-  it.todo(
-    'should group ESM compatible sandbox scripts with sandbox pages',
-    () => {
-      // Main world content scripts
-    },
-  );
 });
@@ -1,25 +1,20 @@
-import { beforeEach, describe, expect, it } from 'vitest';
+import { describe, expect, it } from 'vitest';
 import { importEntrypointFile } from '~/core/utils/building';
+import { fakeInternalConfig } from '~/core/utils/testing/fake-objects';
 import { resolve } from 'node:path';
-import { unnormalizePath } from '../../paths';
-import { setFakeWxt } from '../../testing/fake-objects';

 const entrypointPath = (filename: string) =>
  resolve('src/core/utils/__tests__/test-entrypoints', filename);

-describe('importEntrypointFile', () => {
-  beforeEach(() => {
-    setFakeWxt({
-      config: {
-        imports: false,
-        debug: false,
-        // Run inside the demo folder so that wxt is in the node_modules
-        // WXT must also be built for these tests to pass
-        root: 'demo',
-      },
-    });
-  });
+const config = fakeInternalConfig({
+  imports: false,
+  debug: false,
+  // Run inside the demo folder so that wxt is in the node_modules
+  // WXT must also be built for these tests to pass
+  root: 'demo',
+});

+describe('importEntrypointFile', () => {
  it.each([
    ['background.ts', { main: expect.any(Function) }],
    ['content.ts', { main: expect.any(Function), matches: ['<all_urls>'] }],
@@ -29,7 +24,7 @@ describe('importEntrypointFile', () => {
  ])(
    'should return the default export of test-entrypoints/%s',
    async (file, expected) => {
-      const actual = await importEntrypointFile(entrypointPath(file));
+      const actual = await importEntrypointFile(entrypointPath(file), config);

      expect(actual).toEqual(expected);
    },
@@ -38,19 +33,9 @@ describe('importEntrypointFile', () => {
  it('should return undefined when there is no default export', async () => {
    const actual = await importEntrypointFile(
      entrypointPath('no-default-export.ts'),
+      config,
    );

    expect(actual).toBeUndefined();
  });
-
-  it('should throw a custom error message when an imported variable is used before main', async () => {
-    const filePath = unnormalizePath(
-      '../src/core/utils/__tests__/test-entrypoints/imported-option.ts',
-    );
-    await expect(() =>
-      importEntrypointFile(entrypointPath('imported-option.ts')),
-    ).rejects.toThrowErrorMatchingInlineSnapshot(
-      `[Error: ${filePath}: Cannot use imported variable "faker" outside the main function. See https://wxt.dev/guide/entrypoints.html#side-effects]`,
-    );
-  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Aaron Klinker	c20478cde2	Bump version to 0.14.2-alpha1	2024-01-14 16:19:54 -06:00
Aaron Klinker	ebd50079a7	Cleanup unsed imports	2024-01-14 16:18:47 -06:00
Aaron Klinker	b17bd87865	Add docs	2024-01-14 16:18:19 -06:00
Aaron Klinker	e8b471e23f	Improve typing and add tests for it	2024-01-14 15:05:52 -06:00
Aaron Klinker	32ffca4168	Add client tests	2024-01-14 14:49:15 -06:00
Aaron Klinker	e9c573d5a1	Implement and generate types for `wxt/i18n`	2024-01-12 23:58:55 -06:00
Aaron Klinker	ae5126d726	Update lockfile	2024-01-12 22:49:13 -06:00
Aaron Klinker	24a77ca9b5	Add i18n module to named export list	2024-01-12 22:49:03 -06:00
Aaron Klinker	174cbbc5eb	Add i18n module to auto-imports	2024-01-12 22:45:58 -06:00
Aaron Klinker	607c70dd56	Build `wxt/i18n`	2024-01-12 22:45:41 -06:00
Aaron Klinker	616d012326	Update demo code for testing	2024-01-12 22:45:18 -06:00
Aaron Klinker	75b6ca7172	Add conversion code and tests	2024-01-12 22:45:04 -06:00
Aaron Klinker	1497b3099c	Move demo files	2024-01-12 22:44:33 -06:00