Merge branch 'main' into patch-1

pixijs · Jan 23, 2025 · d76c3f4 · d76c3f4
2 parents 696d959 + d8cf767
commit d76c3f4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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
@@ -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
@@ -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
@@ -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;