Merge branch 'main' into chore/clean

.github/workflows/ci.yml

@@ -19,5 +19,5 @@ jobs:
       - run: npm run lint
       - run: npx nx affected --target=test:types --parallel=3
       - uses: FedericoCarboni/setup-ffmpeg@v2
-      - run: npx nx affected --target=test --parallel=3 --ci
       - run: npx nx affected --target=build --parallel=3
+      - run: npx nx affected --target=test --parallel=3 --ci

lerna.json

@@ -1,7 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useWorkspaces": true,
-  "version": "1.1.3",
+  "version": "1.2.2",
   "command": {
     "publish": {
       "graphType": "all"

packages/cache-buster/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@play-co/assetpack-plugin-cache-buster",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "",
   "homepage": "https://github.com/pixijs/assetpack/tree/master/packages/cache-buster/#readme",
   "bugs": "https://github.com/pixijs/assetpack/issues",
@@ -29,11 +29,10 @@
     "test:types": "tsc --noEmit"
   },
   "dependencies": {
-    "@node-rs/crc32": "^1.10.0",
     "fs-extra": "^11.1.0"
   },
   "devDependencies": {
-    "@play-co/assetpack-core": "1.1.3"
+    "@play-co/assetpack-core": "1.2.2"
   },
   "peerDependencies": {
     "@play-co/assetpack-core": ">=0.0.0"

packages/cache-buster/src/cacheBuster.ts

@@ -1,8 +1,5 @@
 import type { AssetPipe, Asset } from '@play-co/assetpack-core';
 import { createNewAssetAt, swapExt } from '@play-co/assetpack-core';
-import fs from 'fs-extra';
-
-import nodeCrc32 from '@node-rs/crc32';
 
 /**
  * Cache buster asset pipe. This pipe will add a hash to the end of the filename
@@ -28,26 +25,14 @@ export function cacheBuster(): AssetPipe
         },
         async transform(asset: Asset)
         {
-            const buffer = asset.buffer ?? fs.readFileSync(asset.path);
-
-            const hash = crc32(buffer);
+            const hash = asset.hash;
             const newFileName = swapExt(asset.filename, `-${hash}${asset.extension}`);
 
             const newAsset = createNewAssetAt(asset, newFileName);
 
-            // by attaching the buffer - we can avoid reading the file again
-            // and the final copy op will use the buffer, rather than the file path!
-            newAsset.buffer = buffer;
+            newAsset.buffer = asset.buffer;
 
             return [newAsset];
         }
     };
 }
-
-/** Calculate a CRC32 checksum. */
-export function crc32(input: string | Buffer): string
-{
-    const checksumHex = nodeCrc32.crc32(input).toString(16);
-
-    return Buffer.from(checksumHex, 'hex').toString('base64url');
-}

packages/cache-buster/test/cacheBuster.test.ts

@@ -1,7 +1,7 @@
-import { AssetPack, path } from '@play-co/assetpack-core';
-import { existsSync, readFileSync } from 'fs-extra';
+import { Asset, AssetPack, path } from '@play-co/assetpack-core';
+import { existsSync } from 'fs-extra';
 import { assetPath, createFolder, getInputDir, getOutputDir } from '../../../shared/test';
-import { cacheBuster, crc32 } from '../src';
+import { cacheBuster } from '../src';
 
 const pkg = 'cache-buster';
 
@@ -40,10 +40,10 @@ describe('CacheBuster', () =>
 
         const originalPath = path.joinSafe('.testInput', testName, 'ttf.ttf');
 
-        const buffer = readFileSync(originalPath);
-
-        const hash = crc32(buffer);
+        const asset = new Asset({
+            path: originalPath,
+        });
 
-        expect(existsSync(path.joinSafe('.testOutput', testName, `ttf-${hash}.ttf`))).toBe(true);
+        expect(existsSync(path.joinSafe('.testOutput', testName, `ttf-${asset.hash}.ttf`))).toBe(true);
     });
 });

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@play-co/assetpack-cli",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "A simple CLI to run AssetPack",
   "keywords": [
     "assetpack",

packages/compress/src/utils/compressSharp.ts

@@ -1,6 +1,5 @@
 import type { AvifOptions, WebpOptions, JpegOptions, PngOptions } from 'sharp';
 import type { MipmapCompressImageData, CompressOptions } from '../compress';
-import sharp from 'sharp';
 
 export async function compressSharp(
     image: MipmapCompressImageData,
@@ -9,18 +8,14 @@ export async function compressSharp(
 {
     const compressed: MipmapCompressImageData[] = [];
 
-    let sharpImage = image.sharpImage;
+    const sharpImage = image.sharpImage;
 
     if (image.format === '.png' && options.png)
     {
-        // optimising the PNG image and using that as the source of the WebP and AVIF images
-        // will result in a smaller file size and increase the speed of the compression.
-        sharpImage = sharp(await image.sharpImage.png({ ...options.png as PngOptions, force: true }).toBuffer());
-
         compressed.push({
             format: '.png',
             resolution: image.resolution,
-            sharpImage: sharpImage.clone(),
+            sharpImage: sharpImage.clone().png({ ...options.png as PngOptions, force: true }),
         });
     }
 

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@play-co/assetpack-core",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "",
   "homepage": "https://github.com/pixijs/assetpack/tree/master/packages/core/#readme",
   "bugs": "https://github.com/pixijs/assetpack/issues",

packages/core/src/Asset.ts

@@ -132,7 +132,7 @@ export class Asset
             Logger.warn('[Assetpack] folders should not have hashes. Contact the developer of the Assetpack');
         }
 
-        this._hash ??= getHash(this.buffer ?? this.path);
+        this._hash ??= getHash(this.buffer);
 
         return this._hash;
     }

packages/core/src/index.ts

@@ -16,3 +16,4 @@ export * from './utils/merge';
 export * from './utils/path';
 export * from './utils/stripTags';
 export * from './utils/swapExt';
+export * from './utils/findAssetsWithFileName';

packages/core/src/utils/findAssetsWithFileName.ts

@@ -0,0 +1,30 @@
+import type { Asset } from '../Asset';
+
+export function findAssetsWithFileName(
+    test: (asset: Asset) => boolean,
+    asset: Asset,
+    searchTransform: boolean,
+    out: Asset[] = []
+): Asset[]
+{
+    if (test(asset))
+    {
+        out.push(asset);
+    }
+
+    for (let i = 0; i < asset.children.length; i++)
+    {
+        const child = asset.children[i];
+
+        findAssetsWithFileName(test, child, searchTransform, out);
+    }
+
+    for (let i = 0; i < asset.transformChildren.length; i++)
+    {
+        const transformChild = asset.transformChildren[i];
+
+        findAssetsWithFileName(test, transformChild, searchTransform, out);
+    }
+
+    return out;
+}

packages/ffmpeg/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@play-co/assetpack-plugin-ffmpeg",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "",
   "homepage": "https://github.com/pixijs/assetpack/tree/master/packages/ffmpeg/#readme",
   "bugs": "https://github.com/pixijs/assetpack/issues",
@@ -35,8 +35,8 @@
     "fs-extra": "^11.1.0"
   },
   "devDependencies": {
-    "@play-co/assetpack-core": "1.1.3",
-    "@play-co/assetpack-plugin-manifest": "1.1.3"
+    "@play-co/assetpack-core": "1.2.2",
+    "@play-co/assetpack-plugin-manifest": "1.2.2"
   },
   "peerDependencies": {
     "@play-co/assetpack-core": ">=0.0.0",

packages/json/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@play-co/assetpack-plugin-json",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "",
   "homepage": "https://github.com/pixijs/assetpack/tree/master/packages/json/#readme",
   "bugs": "https://github.com/pixijs/assetpack/issues",
@@ -32,7 +32,7 @@
     "fs-extra": "^11.1.0"
   },
   "devDependencies": {
-    "@play-co/assetpack-core": "1.1.3"
+    "@play-co/assetpack-core": "1.2.2"
   },
   "peerDependencies": {
     "@play-co/assetpack-core": ">=0.0.0"

packages/manifest/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@play-co/assetpack-plugin-manifest",
-  "version": "1.1.3",
+  "version": "1.2.2",
   "description": "",
   "homepage": "https://github.com/pixijs/assetpack/tree/master/packages/manifest/#readme",
   "bugs": "https://github.com/pixijs/assetpack/issues",
@@ -33,7 +33,7 @@
     "upath": "^2.0.1"
   },
   "devDependencies": {
-    "@play-co/assetpack-core": "1.1.3"
+    "@play-co/assetpack-core": "1.2.2"
   },
   "peerDependencies": {
     "@play-co/assetpack-core": ">=0.0.0"

packages/manifest/src/pixiManifest.ts

@@ -3,7 +3,8 @@ import {
     type Asset,
     type AssetPipe,
     type PipeSystem,
-    path
+    path,
+    findAssetsWithFileName
 } from '@play-co/assetpack-core';
 
 import fs from 'fs-extra';
@@ -29,6 +30,37 @@ export interface PixiManifestOptions
     output?: string;
     createShortcuts?: boolean;
     trimExtensions?: boolean;
+    includeMetaData?: boolean;
+}
+
+// TODO EXPORT this out! But don't want to create a dependency on the atlas plugin just yet..
+export class AtlasView
+{
+    public rawAtlas: string;
+
+    constructor(buffer: Buffer)
+    {
+        this.rawAtlas = buffer.toString();
+    }
+
+    getTextures(): string[]
+    {
+        const regex = /^.+?(?:\.png|\.jpg|\.jpeg|\.webp|\.avif)$/gm;
+
+        const matches = this.rawAtlas.match(regex);
+
+        return matches as string[];
+    }
+
+    replaceTexture(filename: string, newFilename: string)
+    {
+        this.rawAtlas = this.rawAtlas.replace(filename, newFilename);
+    }
+
+    get buffer()
+    {
+        return Buffer.from(this.rawAtlas);
+    }
 }
 
 export function pixiManifest(_options: PixiManifestOptions = {}): AssetPipe<PixiManifestOptions>
@@ -37,6 +69,7 @@ export function pixiManifest(_options: PixiManifestOptions = {}): AssetPipe<Pixi
         output: 'manifest.json',
         createShortcuts: false,
         trimExtensions: false,
+        includeMetaData: true,
         ..._options
     };
 
@@ -45,6 +78,8 @@ export function pixiManifest(_options: PixiManifestOptions = {}): AssetPipe<Pixi
         defaultOptions,
         finish: async (asset: Asset, options, pipeSystem: PipeSystem) =>
         {
+            removeAtlasTextures(asset);
+
             const newFileName = path.dirname(options.output) === '.'
                 ? path.joinSafe(pipeSystem.outputPath, options.output) : options.output;
 
@@ -100,15 +135,25 @@ function collectAssets(
             {
                 bundleAssets.push({
                     alias: getShortNames(stripTags(path.relative(entryPath, `${asset.path}-${pageIndex}`)), options),
-                    src: pages.map((finalAsset) => path.relative(outputPath, finalAsset.path))
+                    src: pages
+                        .map((finalAsset) => path.relative(outputPath, finalAsset.path))
+                        .sort((a, b) => b.localeCompare(a)),
+                    data:  options.includeMetaData ? {
+                        tags: asset.allMetaData
+                    } : undefined
                 });
             });
         }
         else
         {
             bundleAssets.push({
                 alias: getShortNames(stripTags(path.relative(entryPath, asset.path)), options),
-                src: finalAssets.map((finalAsset) => path.relative(outputPath, finalAsset.path))
+                src: finalAssets
+                    .map((finalAsset) => path.relative(outputPath, finalAsset.path))
+                    .sort((a, b) => b.localeCompare(a)),
+                data:  options.includeMetaData ? {
+                    tags: asset.allMetaData
+                } : undefined
             });
         }
     }
@@ -117,6 +162,34 @@ function collectAssets(
     {
         collectAssets(child, options, outputPath, entryPath, bundles, localBundle);
     });
+
+    // for all assets.. check for atlas and remove them from the bundle..
+}
+
+function removeAtlasTextures(asset: Asset)
+{
+    // do a pass to remove what we don't want..
+
+    const atlasAssets = findAssetsWithFileName((asset) =>
+        asset.extension === '.atlas' && asset.transformChildren.length === 0, asset, true);
+
+    atlasAssets.forEach((atlasAsset) =>
+    {
+        const view = new AtlasView(atlasAsset.buffer);
+
+        const textureNames = view.getTextures();
+
+        textureNames.forEach((texture) =>
+        {
+            const textureAssets = findAssetsWithFileName((asset) =>
+                asset.filename === texture, asset, true);
+
+            textureAssets.forEach((textureAsset) =>
+            {
+                textureAsset.skip = true;
+            });
+        });
+    });
 }
 
 function getTexturePackedAssets(assets: Asset[])