fix!: Remove deprecated jiti entrypoint loader (#1087)

Author: aklinker1

docs/guide/essentials/config/entrypoint-loaders.md

@@ -17,63 +17,3 @@ If you're running into errors while importing entrypoints, run `wxt prepare --de
 :::
 
 Once the environment has been polyfilled and your code pre-processed, it's up the entrypoint loader to import your code, extracting the options from the default export.
-
-There are two options for loading your entrypoints:
-
-1. `vite-node` - default as of `v0.19.0`
-2. `jiti` (**DEPRECATED, will be removed in `v0.20.0`**) - Default before `v0.19.0`
-
-## vite-node
-
-Since 0.19.0, WXT uses `vite-node`, the same tool that powers Vitest and Nuxt, to import your entrypoint files. It re-uses the same vite config used when building your extension, making it the most stable entrypoint loader.
-
-## jiti
-
-To enable `jiti`:
-
-```ts
-export default defineConfig({
-  entrypointLoader: 'jiti',
-});
-```
-
-This is the original method WXT used to import TS files. However, because it doesn't support vite plugins like `vite-node`, it does one additional pre-processing step: It removes **_ALL_** imports from your code.
-
-That means you cannot use imported variables outside the `main` function in JS entrypoints, like for content script `matches` or other options:
-
-```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.
-```
-
-Usually, this error occurs when you try to extract options into a shared file or when running 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() {
-    // ...
-  },
-});
-```

packages/wxt/e2e/tests/manifest-content.test.ts

@@ -1,36 +1,33 @@
 import { describe, it, expect } from 'vitest';
 import { TestProject } from '../utils';
 
-describe.each(['vite-node', 'jiti'] as const)(
-  'Manifest Content (Vite runtime? %s)',
-  (entrypointImporter) => {
-    it.each([
-      { browser: undefined, outDir: 'chrome-mv3', expected: undefined },
-      { browser: 'chrome', outDir: 'chrome-mv3', expected: undefined },
-      { browser: 'firefox', outDir: 'firefox-mv2', expected: true },
-      { browser: 'safari', outDir: 'safari-mv2', expected: false },
-    ])(
-      'should respect the per-browser entrypoint option with %j',
-      async ({ browser, expected, outDir }) => {
-        const project = new TestProject();
+describe('Manifest Content', () => {
+  it.each([
+    { browser: undefined, outDir: 'chrome-mv3', expected: undefined },
+    { browser: 'chrome', outDir: 'chrome-mv3', expected: undefined },
+    { browser: 'firefox', outDir: 'firefox-mv2', expected: true },
+    { browser: 'safari', outDir: 'safari-mv2', expected: false },
+  ])(
+    'should respect the per-browser entrypoint option with %j',
+    async ({ browser, expected, outDir }) => {
+      const project = new TestProject();
 
-        project.addFile(
-          'entrypoints/background.ts',
-          `export default defineBackground({
+      project.addFile(
+        'entrypoints/background.ts',
+        `export default defineBackground({
           persistent: {
             firefox: true,
             safari: false,
           },
           main: () => {},
         })`,
-        );
-        await project.build({ browser, experimental: { entrypointImporter } });
+      );
+      await project.build({ browser });
 
-        const safariManifest = await project.getOutputManifest(
-          `.output/${outDir}/manifest.json`,
-        );
-        expect(safariManifest.background.persistent).toBe(expected);
-      },
-    );
-  },
-);
+      const safariManifest = await project.getOutputManifest(
+        `.output/${outDir}/manifest.json`,
+      );
+      expect(safariManifest.background.persistent).toBe(expected);
+    },
+  );
+});

packages/wxt/package.json

@@ -100,7 +100,6 @@
     "giget": "^1.2.3",
     "hookable": "^5.5.3",
     "is-wsl": "^3.1.0",
-    "jiti": "^1.21.6",
     "json5": "^2.2.3",
     "jszip": "^3.10.1",
     "linkedom": "^0.18.5",

packages/wxt/src/core/builders/vite/index.ts

@@ -20,7 +20,6 @@ import {
 import { Hookable } from 'hookable';
 import { toArray } from '../../utils/arrays';
 import { safeVarName } from '../../utils/strings';
-import { importEntrypointFile } from '../../utils/building';
 import { ViteNodeServer } from 'vite-node/server';
 import { ViteNodeRunner } from 'vite-node/client';
 import { installSourcemapsSupport } from 'vite-node/source-map';
@@ -280,44 +279,26 @@ export async function createViteBuilder(
     version: vite.version,
     async importEntrypoint(path) {
       const env = createExtensionEnvironment();
-      switch (wxtConfig.entrypointLoader) {
-        default:
-        case 'jiti': {
-          return await env.run(() => importEntrypointFile(path));
-        }
-        case 'vite-node': {
-          const { runner, server } = await createViteNodeImporter([path]);
-          const res = await env.run(() => runner.executeFile(path));
-          await server.close();
-          requireDefaultExport(path, res);
-          return res.default;
-        }
-      }
+      const { runner, server } = await createViteNodeImporter([path]);
+      const res = await env.run(() => runner.executeFile(path));
+      await server.close();
+      requireDefaultExport(path, res);
+      return res.default;
     },
     async importEntrypoints(paths) {
       const env = createExtensionEnvironment();
-      switch (wxtConfig.entrypointLoader) {
-        default:
-        case 'jiti': {
-          return await env.run(() =>
-            Promise.all(paths.map(importEntrypointFile)),
-          );
-        }
-        case 'vite-node': {
-          const { runner, server } = await createViteNodeImporter(paths);
-          const res = await env.run(() =>
-            Promise.all(
-              paths.map(async (path) => {
-                const mod = await runner.executeFile(path);
-                requireDefaultExport(path, mod);
-                return mod.default;
-              }),
-            ),
-          );
-          await server.close();
-          return res;
-        }
-      }
+      const { runner, server } = await createViteNodeImporter(paths);
+      const res = await env.run(() =>
+        Promise.all(
+          paths.map(async (path) => {
+            const mod = await runner.executeFile(path);
+            requireDefaultExport(path, mod);
+            return mod.default;
+          }),
+        ),
+      );
+      await server.close();
+      return res;
     },
     async build(group) {
       let entryConfig;

packages/wxt/src/core/resolve-config.ts

@@ -201,7 +201,6 @@ export async function resolveConfig(
     analysis: resolveAnalysisConfig(root, mergedConfig),
     userConfigMetadata: userConfigMetadata ?? {},
     alias,
-    entrypointLoader: mergedConfig.entrypointLoader ?? 'vite-node',
     experimental: defu(mergedConfig.experimental, {}),
     dev: {
       server: devServerConfig,

packages/wxt/src/core/utils/building/__tests__/import-entrypoint.test.ts

@@ -2,6 +2,5 @@ export * from './build-entrypoints';
 export * from './detect-dev-changes';
 export * from './find-entrypoints';
 export * from './group-entrypoints';
-export * from './import-entrypoint';
 export * from './internal-build';
 export * from './rebuild';