@needle-tools/engine 4.7.4 → 4.8.0-alpha

package/plugins/vite/dependencies.js

@@ -27,32 +27,41 @@ export const needleDependencies = (command, config, userSettings) => {
     }
 }
 
+const excludeDependencies = [
+    "three-mesh-bvh",
+    "@needle-tools/gltf-progressive"
+]
+
 /**
  * @param {import('vite').UserConfig} config
  */
 function handleOptimizeDeps(config) {
-    if (config.optimizeDeps?.include?.includes("three-mesh-bvh")) {
-        console.log("[needle-dependencies] three-mesh-bvh is included in the optimizeDeps.include array. This may cause issues with the worker import.");
-    }
-    else {
-        if (!config.optimizeDeps) {
-            config.optimizeDeps = {};
+    excludeDependencies.forEach(dep => {
+        if (config.optimizeDeps?.include?.includes(dep)) {
+            console.log(`[needle-dependencies] ${dep} is included in the optimizeDeps.include array. This may cause issues with the worker import.`);
         }
-        if (!config.optimizeDeps.exclude) {
-            config.optimizeDeps.exclude = [];
-        }
-        console.log("[needle-dependencies] Adding three-mesh-bvh to the optimizeDeps.exclude array.");
-        // This needs to be excluded from optimization because otherwise the worker import fails
-        // three-mesh-bvh/src/workers/generateMeshBVH.worker.js?worker
-        config.optimizeDeps.exclude.push("three-mesh-bvh");
+        else {
+            if (!config.optimizeDeps) {
+                config.optimizeDeps = {};
+            }
+            if (!config.optimizeDeps.exclude) {
+                config.optimizeDeps.exclude = [];
+            }
 
-        if (!config.server) config.server = {};
-        if (!config.server.fs) config.server.fs = {};
-        if (config.server.fs.strict === undefined) {
-            // we need to disable strictness to allow importing the worker from three-mesh-bvh node_modules in our GenerateMeshBVHWorker.js file
-            config.server.fs.strict = false;
+            // This needs to be excluded from optimization because otherwise the worker import fails
+            // three-mesh-bvh/src/workers/generateMeshBVH.worker.js?worker
+            // same for gltf-progressive
+            console.log(`[needle-dependencies] Adding ${dep} to the optimizeDeps.exclude array to support workers.`);
+            config.optimizeDeps.exclude.push(dep);
+
+            if (!config.server) config.server = {};
+            if (!config.server.fs) config.server.fs = {};
+            if (config.server.fs.strict === undefined) {
+                // we need to disable strictness to allow importing the worker from three-mesh-bvh node_modules in our GenerateMeshBVHWorker.js file
+                config.server.fs.strict = false;
+            }
         }
-    }
+    });
 }
 
 /**

package/plugins/vite/dependency-watcher.js

@@ -169,12 +169,17 @@ function testIfInstallIsRequired(projectDir, packageJson) {
                         expectedVersion === "alpha" ||
                         expectedVersion === "canary" ||
                         expectedVersion === "experimental";
+                    // We can not automatically install dependencies with "4" or "4.6" as a version
+                    // const isFullSemver = expectedVersion.match(/^\d+\.\d+\.\d+(-\w+)?(\.\d+)?$/);
                     if (!isRange && !isTagName) {
                         const packageJsonPath = path.join(depPath, "package.json");
                         /** @type {String} */
                         const installedVersion = JSON.parse(readFileSync(packageJsonPath, "utf8")).version;
+                        let versionToCompare = expectedVersion.split("@").pop();
+                        while (versionToCompare?.startsWith("^")) versionToCompare = versionToCompare.substring(1);
                         // fix check for cases where the version contains a alias e.g. npm:three@0.160.3
-                        if (expectedVersion.trimEnd().endsWith(installedVersion.trim()) == false) {
+                        const actualVersion = installedVersion.split("@").pop();
+                        if (actualVersion && versionToCompare && versionToCompare.trimEnd().startsWith(actualVersion.trim()) == false) {
                             log(`Dependency ${key} is installed but version is not the right one. Expected \"${expectedVersion}/" but got \"${installedVersion}\"`)
                             return true;
                         }

package/src/engine-components/postprocessing/PostProcessingHandler.ts

@@ -100,6 +100,8 @@ export class PostProcessingHandler {
         if (context.composer === this._composer) {
             context.composer = null;
         }
+
+        this.handleDevicePixelRatio();
     }
 
     dispose() {
@@ -476,6 +478,11 @@ export class PostProcessingHandler {
 
         }
 
+        
+        this.handleDevicePixelRatio();
+
+        
+
         // DEBUG LAND BELOW
         if (debug) console.log("[PostProcessing] Passes →", [...composer.passes], "\n---------------------------------\n• " + composer.passes.map(i => i.name || (i.constructor.name + "*")).join("\n• ") + "\n");
         if (debug) this._onCreateEffectsDebug(this._composer!, cam);
@@ -497,6 +504,13 @@ export class PostProcessingHandler {
     }
 
 
+    private handleDevicePixelRatio() {
+        // Keep user device pixel ratio (if any) https://linear.app/needle/issue/NE-6661
+        if (typeof this.context.devicePixelRatio === "number") {
+            this.context.requestSizeUpdate();
+        }
+    }
+
 
     private _menuEntry: HTMLSelectElement | null = null;
     private _passIndices: number[] | null = null;