Merge branch 'main' into feat/data-tags

pixijs · Sep 3, 2024 · 05d818b · 05d818b
2 parents 90ffd66 + 972ce84
commit 05d818b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/assetpack/src/image/compress.ts b/packages/assetpack/src/image/compress.ts
@@ -98,6 +98,12 @@ export function compress(options: CompressOptions = {}): AssetPipe<CompressOptio
                     return newAsset;
                 });
 
+                // ensure that the original image is passed through if it is not compressed by png/jpg options
+                if ((image.format === '.png' && !options.png) || (((image.format === '.jpg') || (image.format === '.jpeg')) && !options.jpg))
+                {
+                    newAssets.push(asset);
+                }
+
                 const promises = processedImages.map((image, i) => image.sharpImage.toBuffer().then((buffer) =>
                 {
                     newAssets[i].buffer = buffer;

diff --git a/packages/assetpack/src/texture-packer/packer/createJsons.ts b/packages/assetpack/src/texture-packer/packer/createJsons.ts
@@ -7,7 +7,7 @@ function convertName(pth: string, nameStyle: 'short' | 'relative', removeFileExt
 {
     const name = nameStyle === 'short' ? path.basename(pth) : pth;
 
-    return removeFileExtension ? path.parse(name).name : name;
+    return removeFileExtension ? path.trimExt(name) : name;
 }
 
 export function createJsons(

diff --git a/packages/assetpack/test/image/Compress.test.ts b/packages/assetpack/test/image/Compress.test.ts
@@ -84,9 +84,9 @@ describe('Compress', () =>
             cache: false,
             pipes: [
                 compress({
-                    png: true,
+                    png: false,
                     webp: true,
-                    jpg: true,
+                    jpg: false,
                     avif: true,
                 }),
             ],

diff --git a/packages/docs/docs/guide/pipes/texture-packer.mdx b/packages/docs/docs/guide/pipes/texture-packer.mdx
@@ -88,7 +88,7 @@ To compress the texture atlases you can use the `texturePackerCompress` plugin.
 
 ```js
 import { compress } from "@assetpack/core/image";
-import { compress } from "@assetpack/core/texture-packer";
+import { texturePackerCompress } from "@assetpack/core/texture-packer";
 
 // these options are the default values, all options shown here are optional
 const options = {