@lwrjs/lwc-module-provider 0.12.0-alpha.3 → 0.12.0-alpha.30

package/build/cjs/utils.cjs

@@ -61,17 +61,35 @@ function resolveModuleSpecifier(specifier, importer, modules = [], packageVersio
     message: "resolveModuleSpecifier:resolvedModule",
     additionalInfo: {resolvedModule}
   });
-  const moduleScope = resolvedModule.scope;
+  const moduleEntry = resolvedModule.entry;
   let version;
-  if (packageVersionCache.has(moduleScope)) {
-    version = packageVersionCache.get(moduleScope);
+  if (packageVersionCache.has(moduleEntry)) {
+    version = packageVersionCache.get(moduleEntry);
   } else {
-    const json = (0, import_shared_utils.readFile)(import_path.default.join(moduleScope, "package.json"));
+    const packageJsonPath = findClosestPackageJsonPath(moduleEntry) ?? import_path.default.join(resolvedModule.scope, "package.json");
+    const json = (0, import_shared_utils.readFile)(packageJsonPath);
     version = JSON.parse(json).version;
-    packageVersionCache.set(moduleScope, version);
+    packageVersionCache.set(moduleEntry, version);
   }
   return {...resolvedModule, version};
 }
+function findClosestPackageJsonPath(filepath) {
+  let curDir = import_path.default.dirname(filepath);
+  while (true) {
+    const possiblePath = import_path.default.join(curDir, "package.json");
+    const stats = import_fs.default.statSync(possiblePath, {throwIfNoEntry: false});
+    if (stats?.isFile()) {
+      return possiblePath;
+    } else {
+      const curParentDir = import_path.default.dirname(curDir);
+      if (curDir !== curParentDir) {
+        curDir = curParentDir;
+      } else {
+        return null;
+      }
+    }
+  }
+}
 function isImplicitLwcImport(entry, specifier) {
   const [, fileRelativePathQs] = specifier.split("#");
   const fileRelativePath = fileRelativePathQs?.split("?")[0];

package/build/es/utils.js

@@ -31,18 +31,42 @@ export function resolveModuleSpecifier(specifier, importer, modules = [], packag
         message: 'resolveModuleSpecifier:resolvedModule',
         additionalInfo: { resolvedModule },
     });
-    const moduleScope = resolvedModule.scope;
+    const moduleEntry = resolvedModule.entry;
     let version;
-    if (packageVersionCache.has(moduleScope)) {
-        version = packageVersionCache.get(moduleScope);
+    if (packageVersionCache.has(moduleEntry)) {
+        version = packageVersionCache.get(moduleEntry);
     }
     else {
-        const json = readFile(path.join(moduleScope, 'package.json'));
+        // Find the closest package.json file from the module entry. If none exists (possible with dir or alias module
+        // records), fall back to using the "scope" from which the module is being imported.
+        const packageJsonPath = findClosestPackageJsonPath(moduleEntry) ?? path.join(resolvedModule.scope, 'package.json');
+        const json = readFile(packageJsonPath);
         version = JSON.parse(json).version;
-        packageVersionCache.set(moduleScope, version);
+        packageVersionCache.set(moduleEntry, version);
     }
     return { ...resolvedModule, version };
 }
+// Search upwards until a package.json file is found.
+function findClosestPackageJsonPath(filepath) {
+    let curDir = path.dirname(filepath);
+    // eslint-disable-next-line no-constant-condition
+    while (true) {
+        const possiblePath = path.join(curDir, 'package.json');
+        const stats = fs.statSync(possiblePath, { throwIfNoEntry: false });
+        if (stats?.isFile()) {
+            return possiblePath;
+        }
+        else {
+            const curParentDir = path.dirname(curDir);
+            if (curDir !== curParentDir) {
+                curDir = curParentDir;
+            }
+            else {
+                return null;
+            }
+        }
+    }
+}
 // An implicit import is dependency that the LWC includes automatically to "auto-magically" bind JS, HTML and CSS
 // Sometimes this file might not exist, in which case we need to provide a default
 export function isImplicitLwcImport(entry, specifier) {

package/package.json

@@ -4,7 +4,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "version": "0.12.0-alpha.3",
+    "version": "0.12.0-alpha.30",
     "homepage": "https://developer.salesforce.com/docs/platform/lwr/overview",
     "repository": {
         "type": "git",
@@ -30,14 +30,14 @@
         "build/**/*.d.ts"
     ],
     "dependencies": {
-        "@babel/preset-typescript": "^7.23.3",
-        "@lwrjs/diagnostics": "0.12.0-alpha.3",
-        "@lwrjs/fs-watch": "0.12.0-alpha.3",
-        "@lwrjs/shared-utils": "0.12.0-alpha.3",
-        "fs-extra": "^11.1.1"
+        "@babel/preset-typescript": "^7.24.1",
+        "@lwrjs/diagnostics": "0.12.0-alpha.30",
+        "@lwrjs/fs-watch": "0.12.0-alpha.30",
+        "@lwrjs/shared-utils": "0.12.0-alpha.30",
+        "fs-extra": "^11.2.0"
     },
     "devDependencies": {
-        "@lwrjs/types": "0.12.0-alpha.3",
+        "@lwrjs/types": "0.12.0-alpha.30",
         "typescript": "^4.9.5"
     },
     "peerDependencies": {
@@ -47,5 +47,5 @@
     "engines": {
         "node": ">=18.0.0"
     },
-    "gitHead": "48f97b40cbacce6cd6a6faee9206a465832c6774"
+    "gitHead": "5273cb7ece90a3a28645cb1dfde9d315548605db"
 }