diff --git a/packages/module-auto-icons/build.config.ts b/packages/module-auto-icons/build.config.ts deleted file mode 100644 index 16eeef8b0..000000000 --- a/packages/module-auto-icons/build.config.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { defineBuildConfig } from 'unbuild'; - -export default defineBuildConfig({ - externals: ['fs-extra'], -}); diff --git a/packages/module-auto-icons/package.json b/packages/module-auto-icons/package.json index f77593b90..8c81e2246 100644 --- a/packages/module-auto-icons/package.json +++ b/packages/module-auto-icons/package.json @@ -2,19 +2,12 @@ "name": "@wxt-dev/module-auto-icons", "version": "1.0.0", "type": "module", - "main": "./dist/index.cjs", "module": "./dist/index.mjs", "types": "./dist/index.d.ts", "exports": { ".": { - "import": { - "types": "./dist/index.d.mts", - "default": "./dist/index.mjs" - }, - "require": { - "types": "./dist/index.d.cts", - "default": "./dist/index.cjs" - } + "types": "./dist/index.d.mts", + "default": "./dist/index.mjs" } }, "files": [ diff --git a/packages/module-auto-icons/src/index.ts b/packages/module-auto-icons/src/index.ts index dda7ad96d..2200e87a7 100644 --- a/packages/module-auto-icons/src/index.ts +++ b/packages/module-auto-icons/src/index.ts @@ -1,6 +1,6 @@ import 'wxt'; import { defineWxtModule } from 'wxt/modules'; -import { resolve } from 'path'; +import { resolve, relative } from 'node:path'; import defu from 'defu'; import sharp from 'sharp'; import { ensureDir, exists } from 'fs-extra'; @@ -16,18 +16,20 @@ export default defineWxtModule({ sizes: [128, 48, 32, 16], }); - if (!parsedOptions.enabled) return wxt.logger.warn(`${this.name} disabled`); + if (!parsedOptions.enabled) + return wxt.logger.warn(`\`[auto-icons]\` ${this.name} disabled`); if (!(await exists(parsedOptions.baseIconsPath))) { - return wxt.logger.fatal( - `Cannot generate icons, no base icon found at ${parsedOptions.baseIconsPath}`, + const relativePath = relative(process.cwd(), parsedOptions.baseIconsPath); + return wxt.logger.warn( + `\`[auto-icons]\` Skipping icon generation, no base icon found at ${relativePath}`, ); } wxt.hooks.hook('build:manifestGenerated', async (wxt, manifest) => { if (manifest.icons) return wxt.logger.warn( - 'icons property found in manifest, overwriting with auto-generated icons', + '`[auto-icons]` icons property found in manifest, overwriting with auto-generated icons', ); manifest.icons = Object.fromEntries( @@ -35,7 +37,7 @@ export default defineWxtModule({ ); }); - wxt.hooks.hook('build:done', async (wxt) => { + wxt.hooks.hook('build:done', async (wxt, output) => { const image = sharp(parsedOptions.baseIconsPath).png(); if ( diff --git a/packages/wxt-demo/package.json b/packages/wxt-demo/package.json index fa700c29d..2be37c3da 100644 --- a/packages/wxt-demo/package.json +++ b/packages/wxt-demo/package.json @@ -23,6 +23,7 @@ "devDependencies": { "@types/react": "^18.3.3", "@types/react-dom": "^18.3.0", + "@wxt-dev/module-auto-icons": "workspace:*", "sass": "^1.77.8", "typescript": "^5.5.3", "vitest": "^2.0.3", diff --git a/packages/wxt-demo/src/public/icon/128.png b/packages/wxt-demo/src/assets/icon.png similarity index 100% rename from packages/wxt-demo/src/public/icon/128.png rename to packages/wxt-demo/src/assets/icon.png diff --git a/packages/wxt-demo/src/modules/auto-icons.ts b/packages/wxt-demo/src/modules/auto-icons.ts new file mode 100644 index 000000000..c12e26a4a --- /dev/null +++ b/packages/wxt-demo/src/modules/auto-icons.ts @@ -0,0 +1,3 @@ +import autoIcons from '@wxt-dev/module-auto-icons'; + +export default autoIcons; diff --git a/packages/wxt-demo/src/public/icon/16.png b/packages/wxt-demo/src/public/icon/16.png deleted file mode 100644 index ec6d41d0c..000000000 Binary files a/packages/wxt-demo/src/public/icon/16.png and /dev/null differ diff --git a/packages/wxt-demo/src/public/icon/32.png b/packages/wxt-demo/src/public/icon/32.png deleted file mode 100644 index 521b3c922..000000000 Binary files a/packages/wxt-demo/src/public/icon/32.png and /dev/null differ diff --git a/packages/wxt-demo/src/public/icon/48.png b/packages/wxt-demo/src/public/icon/48.png deleted file mode 100644 index c8bd0393b..000000000 Binary files a/packages/wxt-demo/src/public/icon/48.png and /dev/null differ diff --git a/packages/wxt-demo/src/public/icon/96.png b/packages/wxt-demo/src/public/icon/96.png deleted file mode 100644 index 4b6b658c5..000000000 Binary files a/packages/wxt-demo/src/public/icon/96.png and /dev/null differ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d3ef7af83..ee85f93f9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -411,6 +411,9 @@ importers: '@types/react-dom': specifier: ^18.3.0 version: 18.3.0 + '@wxt-dev/module-auto-icons': + specifier: workspace:* + version: link:../module-auto-icons sass: specifier: ^1.77.8 version: 1.77.8