Skip to content

Commit

Permalink
Merge branch 'chore/clean' into chore/spine
Browse files Browse the repository at this point in the history
  • Loading branch information
Zyie committed Apr 29, 2024
2 parents 5ff76e9 + 6b29617 commit 30f050e
Show file tree
Hide file tree
Showing 16 changed files with 61 additions and 61 deletions.
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.4.0",
"version": "1.4.1",
"command": {
"publish": {
"graphType": "all"
Expand Down
46 changes: 23 additions & 23 deletions package-lock.json

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

4 changes: 2 additions & 2 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.4.0",
"version": "1.4.1",
"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,7 +32,7 @@
"fs-extra": "^11.1.0"
},
"devDependencies": {
"@play-co/assetpack-core": "1.4.0"
"@play-co/assetpack-core": "1.4.1"
},
"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.4.0",
"version": "1.4.1",
"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.4.0",
"version": "1.4.1",
"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.4.0",
"version": "1.4.1",
"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.4.0",
"@play-co/assetpack-plugin-manifest": "1.4.0"
"@play-co/assetpack-core": "1.4.1",
"@play-co/assetpack-plugin-manifest": "1.4.1"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/image/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-image",
"version": "1.4.0",
"version": "1.4.1",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/image/#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.4.0"
"@play-co/assetpack-core": "1.4.1"
},
"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.4.0",
"version": "1.4.1",
"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.4.0"
"@play-co/assetpack-core": "1.4.1"
},
"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.4.0",
"version": "1.4.1",
"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.4.0"
"@play-co/assetpack-core": "1.4.1"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0"
Expand Down
8 changes: 4 additions & 4 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": "1.4.0",
"version": "1.4.1",
"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,9 +32,9 @@
"fs-extra": "^11.1.0"
},
"devDependencies": {
"@play-co/assetpack-core": "1.4.0",
"@play-co/assetpack-plugin-image": "1.4.0",
"@play-co/assetpack-plugin-manifest": "1.4.0"
"@play-co/assetpack-core": "1.4.1",
"@play-co/assetpack-plugin-image": "1.4.1",
"@play-co/assetpack-plugin-manifest": "1.4.1"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/spine/src/spineAtlasCacheBuster.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { removeSync, writeFileSync } from 'fs-extra';
import fs from 'fs-extra';
import { AtlasView } from './AtlasView';
import { type AssetPipe, checkExt, findAssets } from '@play-co/assetpack-core';

Expand Down Expand Up @@ -79,10 +79,10 @@ export function spineAtlasCacheBuster(_options: SpineAtlasCacheBustOptions = {})

atlasAsset.path = atlasAsset.path.replace(originalHash, atlasAsset.hash);

removeSync(originalPath);
fs.removeSync(originalPath);

// rewrite..
writeFileSync(atlasAsset.path, atlasAsset.buffer);
fs.writeFileSync(atlasAsset.path, atlasAsset.buffer);
});

atlasFileToFix.length = 0;
Expand Down
8 changes: 4 additions & 4 deletions packages/spine/src/spineAtlasManifestMod.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { readJsonSync, writeJSONSync } from 'fs-extra';
import fs from 'fs-extra';
import { AtlasView } from './AtlasView';
import { type AssetPipe, findAssets, path } from '@play-co/assetpack-core';

Expand Down Expand Up @@ -61,7 +61,7 @@ export function spineAtlasManifestMod(_options: SpineManifestOptions = {}): Asse
? path.joinSafe(pipeSystem.outputPath, manifestLocation)
: manifestLocation;

const manifest = readJsonSync(newFileName);
const manifest = fs.readJsonSync(newFileName);

atlasAssets.forEach((atlasAsset) =>
{
Expand All @@ -79,8 +79,8 @@ export function spineAtlasManifestMod(_options: SpineManifestOptions = {}): Asse
});
});

writeJSONSync(newFileName, manifest, { spaces: 2 });
},
fs.writeJSONSync(newFileName, manifest, { spaces: 2 });
}
};
}

Expand Down
8 changes: 4 additions & 4 deletions packages/texture-packer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@play-co/assetpack-plugin-texture-packer",
"version": "1.4.0",
"version": "1.4.1",
"description": "",
"homepage": "https://github.com/pixijs/assetpack/tree/master/packages/texture-packer/#readme",
"bugs": "https://github.com/pixijs/assetpack/issues",
Expand Down Expand Up @@ -36,9 +36,9 @@
"sharp": "^0.33.3"
},
"devDependencies": {
"@play-co/assetpack-core": "1.4.0",
"@play-co/assetpack-plugin-image": "1.4.0",
"@play-co/assetpack-plugin-manifest": "1.4.0"
"@play-co/assetpack-core": "1.4.1",
"@play-co/assetpack-plugin-image": "1.4.1",
"@play-co/assetpack-plugin-manifest": "1.4.1"
},
"peerDependencies": {
"@play-co/assetpack-core": ">=0.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/texture-packer/src/texturePackerCacheBuster.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { removeSync, writeFileSync } from 'fs-extra';
import fs from 'fs-extra';
import { type AssetPipe, checkExt, findAssets } from '@play-co/assetpack-core';

import type { Asset, PluginOptions } from '@play-co/assetpack-core';
Expand Down Expand Up @@ -79,10 +79,10 @@ export function texturePackerCacheBuster(

jsonAsset.path = jsonAsset.path.replace(originalHash, jsonAsset.hash);

removeSync(originalPath);
fs.removeSync(originalPath);

// rewrite..
writeFileSync(jsonAsset.path, jsonAsset.buffer);
fs.writeFileSync(jsonAsset.path, jsonAsset.buffer);
});

textureJsonFilesToFix.length = 0;
Expand Down
Loading

0 comments on commit 30f050e

Please sign in to comment.