Skip to content

Commit

Permalink
Merge branch 'main' into chore/metadata-tags
Browse files Browse the repository at this point in the history
  • Loading branch information
GoodBoyDigital committed Apr 22, 2024
2 parents 397e839 + afccd34 commit c0f94ef
Show file tree
Hide file tree
Showing 18 changed files with 77 additions and 293 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useWorkspaces": true,
"version": "1.1.3",
"version": "1.2.0",
"command": {
"publish": {
"graphType": "all"
Expand Down
45 changes: 23 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions packages/cache-buster/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-cache-buster",
"version": "1.1.3",
"version": "1.2.0",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/cache-buster/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down Expand Up @@ -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.0"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0"
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-cli",
"version": "1.1.3",
"version": "1.2.0",
"description": "A simple CLI to run AssetPack",
"keywords": [
"assetpack",
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-core",
"version": "1.1.3",
"version": "1.2.0",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/core/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down
6 changes: 3 additions & 3 deletions packages/ffmpeg/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-ffmpeg",
"version": "1.1.3",
"version": "1.2.0",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/ffmpeg/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down Expand Up @@ -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.0",
"@play-co/assetpack-plugin-manifest": "1.2.0"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/json/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-json",
"version": "1.1.3",
"version": "1.2.0",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/json/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down Expand Up @@ -32,7 +32,7 @@
"fs-extra": "^11.1.0"
},
"devDependencies": {
"@play-co/assetpack-core": "1.1.3"
"@play-co/assetpack-core": "1.2.0"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/manifest/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-manifest",
"version": "1.1.3",
"version": "1.2.0",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/manifest/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down Expand Up @@ -33,7 +33,7 @@
"upath": "^2.0.1"
},
"devDependencies": {
"@play-co/assetpack-core": "1.1.3"
"@play-co/assetpack-core": "1.2.0"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0"
Expand Down
30 changes: 30 additions & 0 deletions packages/manifest/src/pixiManifest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,36 @@ export class AtlasView
}
}

// 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>
{
const defaultOptions = {
Expand Down
4 changes: 2 additions & 2 deletions packages/mipmap-compress/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-mipmap-compress",
"version": "1.1.3",
"version": "1.2.0",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/mipmap-compress/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down Expand Up @@ -33,7 +33,7 @@
"sharp": "^0.33.3"
},
"devDependencies": {
"@play-co/assetpack-core": "1.1.3"
"@play-co/assetpack-core": "1.2.0"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0"
Expand Down
6 changes: 3 additions & 3 deletions packages/spine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-spine",
"version": "0.7.0",
"version": "1.2.0",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/cache-buster/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down Expand Up @@ -32,8 +32,8 @@
"fs-extra": "^11.1.0"
},
"devDependencies": {
"@play-co/assetpack-core": "1.1.3",
"@play-co/assetpack-plugin-mipmap-compress": "1.1.3"
"@play-co/assetpack-core": "1.2.0",
"@play-co/assetpack-plugin-mipmap-compress": "1.2.0"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0",
Expand Down
Binary file removed packages/texture-packer/bin-0.png
Binary file not shown.
Loading

0 comments on commit c0f94ef

Please sign in to comment.