@ecopages/core 0.2.0-alpha.41 → 0.2.0-alpha.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/core",
-  "version": "0.2.0-alpha.41",
+  "version": "0.2.0-alpha.43",
   "description": "Core package for Ecopages",
   "keywords": [
     "ecopages",
@@ -17,7 +17,7 @@
     "directory": "packages/core"
   },
   "dependencies": {
-    "@ecopages/file-system": "0.2.0-alpha.41",
+    "@ecopages/file-system": "0.2.0-alpha.43",
     "@ecopages/logger": "^0.2.3",
     "@ecopages/scripts-injector": "^0.1.5",
     "@worker-tools/html-rewriter": "0.1.0-pre.19",

package/src/services/module-loading/node-bootstrap-plugin.js

@@ -42,9 +42,13 @@ function linkPointsToPackage(linkPath, packageRoot) {
     return false;
   }
 }
-function ensureRuntimePackageLink(nodeModulesDir, specifier, resolvedPath) {
+function resolveRuntimePackageRoot(specifier, resolvedPath, parentPath) {
   const packageName = getPackageNameFromSpecifier(specifier);
-  const packageRoot = findPackageRoot(resolvedPath);
+  return findInstalledPackageDir(packageName, parentPath) ?? findPackageRoot(resolvedPath);
+}
+function ensureRuntimePackageLink(nodeModulesDir, specifier, resolvedPath, parentPath) {
+  const packageName = getPackageNameFromSpecifier(specifier);
+  const packageRoot = resolveRuntimePackageRoot(specifier, resolvedPath, parentPath);
   const linkPath = path.join(nodeModulesDir, packageName);
   mkdirSync(path.dirname(linkPath), { recursive: true });
   if (pathEntryExists(linkPath)) {
@@ -227,7 +231,12 @@ function resolveNodeBootstrapDependency(args, options) {
         const candidatePath = path.join(options.projectDir, "node_modules", packageName);
         const candidatePackageJson = path.join(candidatePath, "package.json");
         if (existsSync(candidatePackageJson)) {
-          ensureRuntimePackageLink(options.runtimeNodeModulesDir, args.path, candidatePackageJson);
+          ensureRuntimePackageLink(
+            options.runtimeNodeModulesDir,
+            args.path,
+            candidatePackageJson,
+            resolveParent
+          );
           return { path: args.path, external: true };
         }
       }
@@ -236,7 +245,7 @@ function resolveNodeBootstrapDependency(args, options) {
       return void 0;
     }
     if (resolvedPath2.includes(`${path.sep}node_modules${path.sep}`)) {
-      ensureRuntimePackageLink(options.runtimeNodeModulesDir, args.path, resolvedPath2);
+      ensureRuntimePackageLink(options.runtimeNodeModulesDir, args.path, resolvedPath2, resolveParent);
       return {
         path: args.path,
         external: true
@@ -245,7 +254,7 @@ function resolveNodeBootstrapDependency(args, options) {
     return { path: resolvedPath2 };
   }
   const resolvedPath = resolveSpecifier(args.path, resolveParent);
-  ensureRuntimePackageLink(options.runtimeNodeModulesDir, args.path, resolvedPath);
+  ensureRuntimePackageLink(options.runtimeNodeModulesDir, args.path, resolvedPath, resolveParent);
   return {
     path: args.path,
     external: true
@@ -266,7 +275,7 @@ function createNodeBootstrapPlugin(options) {
           return void 0;
         }
         const originalContents = readFileSync(args.path, "utf8");
-        const contents = originalContents.replaceAll("import.meta.dirname", JSON.stringify(path.dirname(args.path))).replaceAll("import.meta.filename", JSON.stringify(args.path));
+        const contents = originalContents.replaceAll("import.meta.env", "process.env").replaceAll("import.meta.dirname", JSON.stringify(path.dirname(args.path))).replaceAll("import.meta.filename", JSON.stringify(args.path)).replaceAll("import.meta.dir", JSON.stringify(path.dirname(args.path))).replaceAll("import.meta.path", JSON.stringify(args.path));
         if (contents === originalContents) {
           return void 0;
         }