piral-cli 0.14.24-beta.4168 → 0.14.24-beta.4195

package/src/common/package.ts

@@ -466,13 +466,14 @@ export async function retrievePiletsInfo(entryFile: string) {
     fail('packageJsonMissing_0074');
   }
 
+  const root = dirname(packageJson);
   const packageInfo = require(packageJson);
   const allDeps = {
     ...packageInfo.devDependencies,
     ...packageInfo.dependencies,
   };
   const info = getPiletsInfo(packageInfo);
-  const externals = makeExternals(allDeps, info.externals);
+  const externals = makeExternals(root, allDeps, info.externals);
 
   return {
     ...info,
@@ -486,7 +487,7 @@ export async function retrievePiletsInfo(entryFile: string) {
     },
     scripts: packageInfo.scripts,
     ignored: checkArrayOrUndefined(packageInfo, 'preservedDependencies'),
-    root: dirname(packageJson),
+    root,
   };
 }
 
@@ -524,7 +525,7 @@ export async function patchPiletPackage(
       }
     : info.scripts;
   const peerModules = [];
-  const allExternals = makePiletExternals(piralDependencies, externals, fromEmulator, piralInfo);
+  const allExternals = makePiletExternals(root, piralDependencies, externals, fromEmulator, piralInfo);
   const peerDependencies = {
     ...allExternals.reduce((deps, name) => {
       const valid = isValidDependency(name);

package/src/common/scaffold.ts

@@ -36,6 +36,10 @@ async function getTemplateFiles(
   if (templatePackageName.startsWith('.')) {
     templatePackageName = resolve(process.cwd(), templatePackageName);
   } else {
+    if (templatePackageName.indexOf('@', 1) === -1) {
+      templatePackageName = `${templatePackageName}@latest`;
+    }
+
     await installNpmPackage('npm', templatePackageName, __dirname, '--registry', registry);
   }
 

package/src/plugin.ts

@@ -6,11 +6,11 @@ import { inject } from './inject';
 function getContainerDir() {
   const currentDir = __dirname.split(sep).join(posix.sep);
 
-  if (currentDir.includes(`/.pnpm/${cliName}@${cliVersion}/node_modules/${cliName}/`)) {
-    return resolve(__dirname, '..', '..', '..', '..', '..');
+  if (!currentDir.includes(`/.pnpm/${cliName}@${cliVersion}/node_modules/${cliName}/`)) {
+    return resolve(__dirname, '..', '..');
   }
 
-  return resolve(__dirname, '..', '..');
+  return undefined;
 }
 
 async function getLocalPackageDir() {
@@ -25,7 +25,7 @@ async function getLocalPackageDir() {
   // Right now we always take the first one, but in the future this may be different
   // once we come up with more / better criteria to identify if its a good/valid
   // plugin root directory
-  for (const dir of proposedDirs) {
+  for (const dir of proposedDirs.filter(Boolean)) {
     log('generalDebug_0003', `Checking for potential plugin directory "${dir}" ...`);
 
     if (await isDirectory(dir)) {