@needle-tools/engine 3.0.1-alpha.1 → 3.0.1-alpha.2

package/CHANGELOG.md

@@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [3.0.1-alpha] - 2023-04-11
 - Change: store static Context.Current in globalThis
+- Change: alias resolve imports `@needle-tools/engine/engine` and `@needle-tools/engine/src` to lib folder
 
 ## [3.0.0-alpha] - 2023-04-05
 - Add: vite alias plugin

package/package.json

@@ -1,9 +1,16 @@
 {
     "name": "@needle-tools/engine",
-    "version": "3.0.1-alpha.1",
+    "version": "3.0.1-alpha.2",
     "description": "Needle Engine is a web-based runtime for 3D apps. It runs on your machine for development, and can be deployed anywhere. It is flexible, extensible, and collaboration and XR come naturally.",
     "main": "dist/needle-engine.umd.cjs",
-    "module": "lib/needle-engine.js",
+    "exports": {
+        ".": {
+            "import": "./lib/needle-engine.js",
+            "require": "./dist/needle-engine.umd.cjs"
+        },
+        "./package.json": "./package.json",
+        "./plugins/vite/index.js": "./plugins/vite/index.js"
+    },
     "type": "module",
     "repository": {
         "type": "git",
@@ -102,6 +109,7 @@
             "quiet": false
         }
     },
+    "module": "lib/needle-engine.js",
     "typings": "lib/needle-engine.d.ts",
     "types": "lib/needle-engine.d.ts"
 }

package/plugins/vite/alias.js

@@ -3,12 +3,26 @@ import path from 'path';
 
 const projectDir = process.cwd() + "/";
 
+/** these are alias callbacks as in the vite.alias dictionary
+ * the first argument is the already resoled absolute path (it is only invoked if the path was found in node_modules)
+ * the 2,3,4 args are the same as in vite.alias (packageName, index, path);
+ */
 const packages_to_resolve = {
-    'three': {},
-    '@needle-tools/engine': {},
-    'peerjs': {},
-    'websocket-ts': {},
-    'md5': {},
+    // Handle all previous imports where users did import using @needle-engine/src
+    '@needle-tools/engine/src': (res, packageName, index, path) => {
+        return res + "/../lib";
+    },
+    '@needle-tools/engine': (res, packageName, index, path) => {
+        // Check if the import is something like @needle-tools/engine/engine/engine_utils
+        // in which case we want to resolve into the lib directory
+        if (path.startsWith("@needle-tools/engine/engine")) {
+            return res + "/lib";
+        }
+    },
+    'three': null,
+    'peerjs': null,
+    'websocket-ts': null,
+    'md5': null,
 }
 
 export const needleViteAlias = (command, config, userSettings) => {
@@ -28,18 +42,26 @@ export const needleViteAlias = (command, config, userSettings) => {
             const aliasDict = config.resolve.alias;
             for (const name in packages_to_resolve) {
                 if (!aliasDict[name]) {
-                    addPathResolver(name, aliasDict);
+                    addPathResolver(name, aliasDict, packages_to_resolve[name]);
                 }
             }
         }
     }
 
-    function addPathResolver(name, aliasList) {
+    function addPathResolver(name, aliasDict, cb) {
         // If a package at the node_modules path exist we resolve the request there
         // introduced in 89a50718c38940abb99ee16c5e029065e41d7d65
         const res = path.resolve(projectDir, 'node_modules', name);
+        if (typeof cb !== "function") cb = null;
         if (existsSync(res)) {
-            aliasList[name] = () => res;
+            aliasDict[name] = (packageName, index, path) => {
+                if (cb !== null) {
+                    const overrideResult = cb(res, packageName, index, path);
+                    if (overrideResult !== undefined)
+                        return overrideResult;
+                }
+                return res;
+            }
         }
     }
 };