Skip to content

Commit 4562044

Browse files
committed
fix: remove taskId with resultMap
1 parent 0d95884 commit 4562044

File tree

4 files changed

+46
-28
lines changed

4 files changed

+46
-28
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "unplugin-imagemin",
3-
"version": "0.6.9",
3+
"version": "0.7.0",
44
"description": "📦 📦 unplugin compression Image Compression plugin based on squoosh and svgo",
55
"license": "MIT",
66
"keywords": [

playground/src/App.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<script setup lang="ts">
22
import Img from './assets/image/wallhaven-2ykjxm.png'
3+
const demo = new URL('./assets/image/wallhaven-2ykjxm.png', import.meta.url).href
34
</script>
45

56
<template>
67
<div>
78
<img style="width: 1200px" src="./assets/image/wallhaven-kxy326.png" alt="" />
89
<img style="width: 1200px" src="./assets/image/wallhaven-x61xdo.jpg" alt="" />
9-
<img :src="Img" alt="">
10-
<router-link to="/home">Go to Home</router-link>
11-
<router-link to="/about">Go to About</router-link>
12-
<RouterView />
10+
<img :src="demo" alt="">
11+
<img :src="Img" alt="">
12+
<!-- <router-link to="/home">Go to Home</router-link>
13+
<router-link to="/about">Go to About</router-link>
14+
<RouterView /> -->
1315
</div>
1416
</template>
1517

playground/vite.config.ts

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,31 @@ export default defineConfig({
1919
// publicDir: 'base/public',
2020
plugins: [
2121
vue(),
22+
// imagemin({
23+
// // default true
24+
// cache: false,
25+
// // Default configuration options for compressing different pictures
26+
// compress: {
27+
// jpg: {
28+
// quality: 10,
29+
// },
30+
// jpeg: {
31+
// quality: 10,
32+
// },
33+
// png: {
34+
// quality: 10,
35+
// },
36+
// webp: {
37+
// quality: 10,
38+
// },
39+
// },
40+
// conversion: [
41+
// { from: 'jpeg', to: 'webp' },
42+
// { from: 'png', to: 'webp' },
43+
// { from: 'JPG', to: 'jpeg' },
44+
// ],
45+
// }),
2246
imagemin({
23-
// default true
24-
cache: false,
25-
// Default configuration options for compressing different pictures
26-
compress: {
27-
jpg: {
28-
quality: 10,
29-
},
30-
jpeg: {
31-
quality: 10,
32-
},
33-
png: {
34-
quality: 10,
35-
},
36-
webp: {
37-
quality: 10,
38-
},
39-
},
4047
conversion: [
4148
{ from: 'jpeg', to: 'webp' },
4249
{ from: 'png', to: 'webp' },

src/core/context.ts

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,12 @@ export default class Context {
152152

153153
this.startGenerateLogger();
154154
const spinner = await loadWithRocketGradient('');
155-
const tasks = [];
155+
const tasks: Array<
156+
Promise<{
157+
originFileName: string;
158+
result?: { result: ProcessedResult };
159+
}>
160+
> = [];
156161

157162
for (const [fileName, asset] of Object.entries(bundler)) {
158163
if (asset.type === 'asset' && extImageRE.test(fileName)) {
@@ -202,17 +207,21 @@ export default class Context {
202207
// biome-ignore lint/complexity/noForEach: <explanation>
203208
baseResult.forEach(({ originFileName, result }) => {
204209
if (result) {
205-
fileNameMap.set(originFileName, result.result.fileName);
210+
fileNameMap.set(originFileName, result.fileName);
206211
}
207212
});
208213

209-
let taskIndex = 0;
214+
const resultMap = new Map(
215+
baseResult
216+
.filter((item) => item?.result)
217+
.map((item) => [item.originFileName, item.result] as const),
218+
);
210219
for (const [fileName, asset] of Object.entries(bundler)) {
211220
if (asset.type === 'asset' && extImageRE.test(fileName)) {
212-
const result = baseResult[taskIndex++];
221+
const result = resultMap.get(asset.fileName);
213222
if (result) {
214-
asset.fileName = result.result.fileName;
215-
asset.source = result.result.source;
223+
asset.fileName = result.fileName;
224+
asset.source = result.source;
216225
}
217226
}
218227
}

0 commit comments

Comments
 (0)