piral-cli 0.15.0-beta.4816 → 0.15.0-beta.4828

package/src/common/package.ts

@@ -2,15 +2,22 @@ import { resolve, join, extname, basename, dirname, relative } from 'path';
 import { log, fail } from './log';
 import { cliVersion } from './info';
 import { unpackTarball } from './archive';
-import { getDependencies, getDependencyPackages, getDevDependencies, getDevDependencyPackages } from './language';
 import { ForceOverwrite } from './enums';
 import { checkAppShellCompatibility } from './compatibility';
 import { deepMerge } from './merge';
 import { readImportmap } from './importmap';
 import { getHash, checkIsDirectory, matchFiles } from './io';
 import { readJson, copy, updateExistingJson, findFile, checkExists } from './io';
-import { isGitPackage, isLocalPackage, makeGitUrl, makeFilePath } from './npm';
+import { isGitPackage, isLocalPackage, makeGitUrl, makeFilePath, tryResolvePackage } from './npm';
 import { makePiletExternals, makeExternals, findPackageRoot, findSpecificVersion } from './npm';
+import { getModulePath } from '../external';
+import {
+  getDependencies,
+  getDependencyPackages,
+  getDevDependencies,
+  getDevDependencyPackages,
+  getFrameworkDependencies,
+} from './language';
 import {
   filesTar,
   filesOnceTar,
@@ -18,8 +25,8 @@ import {
   bundlerNames,
   piralJsonSchemaUrl,
   piletJsonSchemaUrl,
+  frameworkLibs,
 } from './constants';
-import { getModulePath } from '../external';
 import {
   SourceLanguage,
   Framework,
@@ -235,6 +242,7 @@ export async function getPiralPackage(app: string, data: PiralInstanceData, vers
     'piral-cli': `${version}`,
   };
   const dependencies = {
+    ...getFrameworkDependencies(framework, version),
     ...getDependencies(data.language, getDependencyPackages(framework, data.reactVersion, data.reactRouterVersion)),
   };
 
@@ -481,9 +489,11 @@ export function findDependencyVersion(
   pckg: Record<string, any>,
   rootPath: string,
   packageName: string,
+  parents: Array<string> = [],
 ): Promise<string> {
   const { devDependencies = {}, dependencies = {} } = pckg;
   const desiredVersion = dependencies[packageName] ?? devDependencies[packageName];
+  const [parent] = parents;
 
   if (desiredVersion) {
     if (isGitPackage(desiredVersion)) {
@@ -493,22 +503,36 @@ export function findDependencyVersion(
     }
   }
 
+  if (parent) {
+    // in case the dependency came from another package (= parent)
+    // we should start the lookup in its directory (pnpm issue)
+    const parentPath = tryResolvePackage(parent, rootPath);
+
+    if (parentPath) {
+      rootPath = dirname(parentPath);
+    }
+  }
+
   return findPackageVersion(rootPath, packageName);
 }
 
-export async function findPackageVersion(rootPath: string, packageName: string): Promise<string> {
-  try {
-    log('generalDebug_0003', `Finding the version of "${packageName}" in "${rootPath}".`);
-    const moduleName = getModulePath(rootPath, packageName);
-    const packageJson = await findFile(moduleName, 'package.json');
-    return require(packageJson).version;
-  } catch (e) {
-    log('cannotResolveDependency_0053', packageName, rootPath);
-    return 'latest';
+export async function findPackageVersion(rootPath: string, packageName: string | Array<string>): Promise<string> {
+  const packages = Array.isArray(packageName) ? packageName : [packageName];
+
+  for (const pckg of packages) {
+    try {
+      log('generalDebug_0003', `Finding the version of "${packageName}" in "${rootPath}".`);
+      const moduleName = getModulePath(rootPath, pckg);
+      const packageJson = await findFile(moduleName, 'package.json');
+      return require(packageJson).version;
+    } catch {}
   }
+
+  log('cannotResolveDependency_0053', packages, rootPath);
+  return 'latest';
 }
 
-export async function retrieveExternals(root: string, packageInfo: any) {
+export async function retrieveExternals(root: string, packageInfo: any): Promise<Array<SharedDependency>> {
   const sharedDependencies = await readImportmap(root, packageInfo);
 
   if (sharedDependencies.length === 0) {
@@ -517,10 +541,18 @@ export async function retrieveExternals(root: string, packageInfo: any) {
       ...packageInfo.dependencies,
     };
     const deps = packageInfo.pilets?.externals;
-    return makeExternals(root, allDeps, deps);
+    const externals = makeExternals(root, allDeps, deps);
+    return externals.map((ext) => ({
+      id: ext,
+      name: ext,
+      entry: ext,
+      type: 'local',
+      ref: undefined,
+      requireId: ext,
+    }));
   }
 
-  return sharedDependencies.map((m) => m.name);
+  return sharedDependencies;
 }
 
 export async function retrievePiletsInfo(entryFile: string) {
@@ -540,17 +572,20 @@ export async function retrievePiletsInfo(entryFile: string) {
   const packageInfo = require(packageJson);
   const info = getPiletsInfo(packageInfo);
   const externals = await retrieveExternals(root, packageInfo);
+  const dependencies = {
+    std: packageInfo.dependencies || {},
+    dev: packageInfo.devDependencies || {},
+    peer: packageInfo.peerDependencies || {},
+  };
+  const framework = frameworkLibs.find((lib) => lib in dependencies.std || lib in dependencies.dev);
 
   return {
     ...info,
     externals,
     name: packageInfo.name,
     version: packageInfo.version,
-    dependencies: {
-      std: packageInfo.dependencies || {},
-      dev: packageInfo.devDependencies || {},
-      peer: packageInfo.peerDependencies || {},
-    },
+    framework,
+    dependencies,
     scripts: packageInfo.scripts,
     ignored: checkArrayOrUndefined(packageInfo, 'preservedDependencies'),
     root,
@@ -595,7 +630,7 @@ async function getPiletPackage(
   newInfo?: { language: SourceLanguage; bundler: string },
 ) {
   const { piralCLI = { version: cliVersion } } = piralInfo;
-  const { externals, packageOverrides, ...info } = getPiletsInfo(piralInfo);
+  const { packageOverrides, ...info } = getPiletsInfo(piralInfo);
   const piralDependencies = {
     ...piralInfo.devDependencies,
     ...piralInfo.dependencies,
@@ -610,7 +645,7 @@ async function getPiletPackage(
         ...info.scripts,
       }
     : info.scripts;
-  const allExternals = makePiletExternals(root, piralDependencies, externals, fromEmulator, piralInfo);
+  const allExternals = makePiletExternals(root, piralDependencies, fromEmulator, piralInfo);
   const devDependencies: Record<string, string> = {
     ...Object.keys(typeDependencies).reduce((deps, name) => {
       deps[name] = piralDependencies[name] || typeDependencies[name];

package/src/messages.ts

@@ -1231,8 +1231,12 @@ export function cannotResolveVersion_0052(name: string): QuickMessage {
  * }
  * ```
  */
-export function cannotResolveDependency_0053(name: string, rootDir: string): QuickMessage {
-  return [LogLevels.warning, '0053', `Could not resolve "${name}" from "${rootDir}". Taking "latest" version.`];
+export function cannotResolveDependency_0053(names: Array<string>, rootDir: string): QuickMessage {
+  return [
+    LogLevels.warning,
+    '0053',
+    `Could not resolve any package (tried "${names.join('", "')}") from "${rootDir}". Taking "latest" version.`,
+  ];
 }
 
 /**
@@ -2387,7 +2391,11 @@ export function publishFeedMissingUrl_0115(): QuickMessage {
  * ```
  */
 export function publishFeedMissingVersion_0116(): QuickMessage {
-  return [LogLevels.error, '0116', `The "feed" provider requires either a "--opts.version" argument or a package.json with a version.`];
+  return [
+    LogLevels.error,
+    '0116',
+    `The "feed" provider requires either a "--opts.version" argument or a package.json with a version.`,
+  ];
 }
 
 /**
@@ -2624,11 +2632,7 @@ export function bundlerUnspecified_0175(available: Array<string>): QuickMessage
  * ```
  */
 export function bundlerNotInstalled_0176(): QuickMessage {
-  return [
-    LogLevels.warning,
-    '0176',
-    `Installing default bundler since no bundler has been found.`,
-  ];
+  return [LogLevels.warning, '0176', `Installing default bundler since no bundler has been found.`];
 }
 
 /**

package/src/rules/pilet-has-externals-as-peers.ts

@@ -26,10 +26,10 @@ export default async function (context: PiletRuleContext, options: Options = 'ig
     const markedPeerDependencies = Object.keys(context.peerDependencies);
     const markedPeerModules = context.peerModules;
     const missingExternals = externals
-      .map((name) => {
-        const valid = isValidDependency(name);
-        const missing = !(valid ? markedPeerDependencies : markedPeerModules).includes(name);
-        return { name, valid, missing };
+      .map((external) => {
+        const valid = isValidDependency(external.name);
+        const missing = !(valid ? markedPeerDependencies : markedPeerModules).includes(external.name);
+        return { name: external.name, valid, missing };
       })
       .filter((m) => m.missing);
 

package/src/rules/piral-has-valid-externals.ts

@@ -6,7 +6,7 @@ export type Options = void;
  * Checks that the externals to be used in pilets are valid.
  */
 export default function (context: PiralRuleContext, options: Options = undefined) {
-  const { externals } = context.info;
+  const { externals } = context;
 
   if (!Array.isArray(externals)) {
     context.error(

package/src/types/common.ts

@@ -104,7 +104,6 @@ export interface TemplateFileLocation {
 export interface PiletsInfo {
   files: Array<string | TemplateFileLocation>;
   template: string;
-  externals?: Array<string>;
   devDependencies: Record<string, string | true>;
   scripts: Record<string, string>;
   validators: Record<string, any>;
@@ -147,6 +146,7 @@ export interface Rule<T extends RuleContext> {
 
 export interface PiralRuleContext extends RuleContext {
   info: PiletsInfo;
+  externals: Array<SharedDependency>;
 }
 
 export interface PiletRuleContext extends RuleContext {