chore(release): v0.17.7

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v0.17.7
+
+[compare changes](https://github.com/wxt-dev/wxt/compare/v0.17.6...v0.17.7)
+
+### 🩹 Fixes
+
+- **zip:** List `.wxt/local_modules` overrides relative to the `package.json` they're added to ([#526](https://github.com/wxt-dev/wxt/pull/526))
+
+### 🏡 Chore
+
+- Bump templates to v0.17 ([#524](https://github.com/wxt-dev/wxt/pull/524))
+- Increase test timeout for windows NPM tests ([#525](https://github.com/wxt-dev/wxt/pull/525))
+
 ## v0.17.6
 
 [compare changes](https://github.com/wxt-dev/wxt/compare/v0.17.5...v0.17.6)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "wxt",
   "type": "module",
-  "version": "0.17.6",
+  "version": "0.17.7",
   "description": "Next gen framework for developing web extensions",
   "engines": {
     "node": ">=18",

src/core/package-managers/__tests__/npm.test.ts

@@ -6,41 +6,45 @@ import { exists } from 'fs-extra';
 
 const cwd = path.resolve(__dirname, 'fixtures/npm-project');
 
-describe('NPM Package Management Utils', () => {
-  beforeAll(async () => {
-    // NPM needs the modules installed for 'npm ls' to work
-    await execaCommand('npm i', { cwd });
-  });
-
-  describe('listDependencies', () => {
-    it('should list direct dependencies', async () => {
-      const actual = await npm.listDependencies({ cwd });
-      expect(actual).toEqual([
-        { name: 'flatten', version: '1.0.3' },
-        { name: 'mime-types', version: '2.1.35' },
-      ]);
+describe(
+  'NPM Package Management Utils',
+  () => {
+    beforeAll(async () => {
+      // NPM needs the modules installed for 'npm ls' to work
+      await execaCommand('npm i', { cwd });
     });
 
-    it('should list all dependencies', async () => {
-      const actual = await npm.listDependencies({ cwd, all: true });
-      expect(actual).toEqual([
-        { name: 'flatten', version: '1.0.3' },
-        { name: 'mime-types', version: '2.1.35' },
-        { name: 'mime-db', version: '1.52.0' },
-      ]);
+    describe('listDependencies', () => {
+      it('should list direct dependencies', async () => {
+        const actual = await npm.listDependencies({ cwd });
+        expect(actual).toEqual([
+          { name: 'flatten', version: '1.0.3' },
+          { name: 'mime-types', version: '2.1.35' },
+        ]);
+      });
+
+      it('should list all dependencies', async () => {
+        const actual = await npm.listDependencies({ cwd, all: true });
+        expect(actual).toEqual([
+          { name: 'flatten', version: '1.0.3' },
+          { name: 'mime-types', version: '2.1.35' },
+          { name: 'mime-db', version: '1.52.0' },
+        ]);
+      });
     });
-  });
 
-  describe('downloadDependency', () => {
-    it('should download the dependency as a tarball', async () => {
-      const downloadDir = path.resolve(cwd, 'dist');
-      const id = 'mime-db@1.52.0';
-      const expected = path.resolve(downloadDir, 'mime-db-1.52.0.tgz');
+    describe('downloadDependency', () => {
+      it('should download the dependency as a tarball', async () => {
+        const downloadDir = path.resolve(cwd, 'dist');
+        const id = 'mime-db@1.52.0';
+        const expected = path.resolve(downloadDir, 'mime-db-1.52.0.tgz');
 
-      const actual = await npm.downloadDependency(id, downloadDir);
+        const actual = await npm.downloadDependency(id, downloadDir);
 
-      expect(actual).toEqual(expected);
-      expect(await exists(actual)).toBe(true);
+        expect(actual).toEqual(expected);
+        expect(await exists(actual)).toBe(true);
+      });
     });
-  });
-});
+  },
+  { timeout: 20e3 },
+);

src/core/zip.ts

@@ -62,9 +62,9 @@ export async function zip(config?: InlineConfig): Promise<string[]> {
     await zipDir(wxt.config.zip.sourcesRoot, sourcesZipPath, {
       include: wxt.config.zip.includeSources,
       exclude: wxt.config.zip.excludeSources,
-      transform(file, content) {
-        if (file.endsWith('package.json')) {
-          return addOverridesToPackageJson(content, overrides);
+      transform(absolutePath, zipPath, content) {
+        if (zipPath.endsWith('package.json')) {
+          return addOverridesToPackageJson(absolutePath, content, overrides);
         }
       },
       additionalFiles: downloadedPackages,
@@ -88,7 +88,8 @@ async function zipDir(
     include?: string[];
     exclude?: string[];
     transform?: (
-      file: string,
+      absolutePath: string,
+      zipPath: string,
       content: string,
     ) => Promise<string | undefined | void> | string | undefined | void;
     additionalWork?: (archive: JSZip) => Promise<void> | void;
@@ -125,7 +126,7 @@ async function zipDir(
       const content = await fs.readFile(absolutePath, 'utf-8');
       archive.file(
         file,
-        (await options?.transform?.(file, content)) || content,
+        (await options?.transform?.(absolutePath, file, content)) || content,
       );
     } else {
       const content = await fs.readFile(absolutePath);
@@ -159,8 +160,7 @@ async function downloadPrivatePackages() {
         wxt.config.zip.downloadedPackagesDir,
       );
       files.push(tgzPath);
-      overrides[id] =
-        'file://./' + normalizePath(path.relative(wxt.config.root, tgzPath));
+      overrides[id] = tgzPath;
     }
   }
 
@@ -168,18 +168,21 @@ async function downloadPrivatePackages() {
 }
 
 function addOverridesToPackageJson(
+  absolutePackageJsonPath: string,
   content: string,
   overrides: Record<string, string>,
 ): string {
   if (Object.keys(overrides).length === 0) return content;
 
+  const packageJsonDir = path.dirname(absolutePackageJsonPath);
   const oldPackage = JSON.parse(content);
   const newPackage = {
     ...oldPackage,
-    [wxt.pm.overridesKey]: {
-      ...oldPackage[wxt.pm.overridesKey],
-      ...overrides,
-    },
+    [wxt.pm.overridesKey]: { ...oldPackage[wxt.pm.overridesKey] },
   };
+  Object.entries(overrides).forEach(([key, absolutePath]) => {
+    newPackage[wxt.pm.overridesKey][key] =
+      'file://./' + normalizePath(path.relative(packageJsonDir, absolutePath));
+  });
   return JSON.stringify(newPackage, null, 2);
 }

templates/react/package.json

@@ -23,6 +23,6 @@
     "@types/react-dom": "^18.2.18",
     "@vitejs/plugin-react": "^4.2.1",
     "typescript": "^5.3.3",
-    "wxt": "^0.16.0"
+    "wxt": "^0.17.0"
   }
 }

templates/solid/package.json

@@ -20,6 +20,6 @@
   "devDependencies": {
     "typescript": "^5.3.3",
     "vite-plugin-solid": "^2.8.0",
-    "wxt": "^0.16.0"
+    "wxt": "^0.17.0"
   }
 }

templates/svelte/package.json

@@ -20,6 +20,6 @@
     "svelte-check": "^3.6.2",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3",
-    "wxt": "^0.16.0"
+    "wxt": "^0.17.0"
   }
 }

templates/vanilla/package.json

@@ -16,6 +16,6 @@
   },
   "devDependencies": {
     "typescript": "^5.3.3",
-    "wxt": "^0.16.0"
+    "wxt": "^0.17.0"
   }
 }

templates/vue/package.json

@@ -21,6 +21,6 @@
     "@vitejs/plugin-vue": "^5.0.1",
     "typescript": "^5.3.3",
     "vue-tsc": "^1.8.27",
-    "wxt": "^0.16.0"
+    "wxt": "^0.17.0"
   }
 }