diff --git a/package-lock.json b/package-lock.json index 9b5f108..3e312ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -32140,7 +32140,7 @@ }, "packages/assetpack": { "name": "@assetpack/core", - "version": "1.2.2", + "version": "1.2.3", "license": "MIT", "dependencies": { "@ffmpeg-installer/ffmpeg": "^1.1.0", diff --git a/package.json b/package.json index ae6c25b..a56e441 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "publish-ci": "npm run publish-ci --workspace @assetpack/core", "pretest": "npm run clean", "test": "vitest run", - "test:lint": "xs lint", + "test:lint": "xs lint --max-warnings 0", "test:types": "xs types", "test:watch": "vitest", "watch": "npm run --ws watch --if-present", diff --git a/packages/assetpack/package.json b/packages/assetpack/package.json index 96aa932..ed3b835 100644 --- a/packages/assetpack/package.json +++ b/packages/assetpack/package.json @@ -1,6 +1,6 @@ { "name": "@assetpack/core", - "version": "1.2.2", + "version": "1.2.3", "keywords": [], "homepage": "https://pixijs.io/assetpack/", "bugs": "https://github.com/pixijs/assetpack/issues", diff --git a/packages/assetpack/src/cli/index.ts b/packages/assetpack/src/cli/index.ts index bd91636..9fab245 100644 --- a/packages/assetpack/src/cli/index.ts +++ b/packages/assetpack/src/cli/index.ts @@ -52,7 +52,9 @@ async function main() try { /* eslint-disable @typescript-eslint/no-var-requires, global-require */ - config = require(configPath) as AssetPackConfig; + const configModule = require(configPath); + + config = (configModule.__esModule ? configModule.default : configModule); AssetPack = require('@assetpack/core').AssetPack; /* eslint-enable @typescript-eslint/no-var-requires, global-require */ } diff --git a/packages/assetpack/src/core/AssetWatcher.ts b/packages/assetpack/src/core/AssetWatcher.ts index 533ec09..45d99e8 100644 --- a/packages/assetpack/src/core/AssetWatcher.ts +++ b/packages/assetpack/src/core/AssetWatcher.ts @@ -276,7 +276,7 @@ export class AssetWatcher files.forEach((file) => { file = upath.toUnix(file); - + const fullPath = path.joinSafe(asset.path, file); if (fullPath.includes('DS_Store')) return;