piral-cli 0.15.0-alpha.4409 → 0.15.0-beta.4466

package/src/common/clients/pnp.ts

@@ -44,8 +44,8 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
   return ms.value;
 }
 
-export async function detectClient(root: string) {
-  return !!(await findFile(root, '.pnp.cjs'));
+export async function detectClient(root: string, stopDir = resolve(root, '/')) {
+  return !!(await findFile(root, '.pnp.cjs', stopDir));
 }
 
 export async function initProject(projectName: string, target: string) {}

package/src/common/clients/pnpm.ts

@@ -40,8 +40,8 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
   return ms.value;
 }
 
-export async function detectClient(root: string) {
-  return !!(await findFile(root, 'pnpm-lock.yaml'));
+export async function detectClient(root: string, stopDir = resolve(root, '/')) {
+  return !!(await findFile(root, 'pnpm-lock.yaml', stopDir));
 }
 
 export async function initProject(projectName: string, target: string) {}

package/src/common/clients/rush.ts

@@ -47,8 +47,8 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
   return ms.value;
 }
 
-export async function detectClient(root: string) {
-  return !!(await findFile(root, rushJson));
+export async function detectClient(root: string, stopDir = resolve(root, '/')) {
+  return !!(await findFile(root, rushJson, stopDir));
 }
 
 export async function initProject(packageName: string, target: string) {

package/src/common/clients/yarn.ts

@@ -44,8 +44,8 @@ export async function installPackage(packageRef: string, target = '.', ...flags:
   return ms.value;
 }
 
-export async function detectClient(root: string) {
-  return !!(await findFile(root, 'yarn.lock'));
+export async function detectClient(root: string, stopDir = resolve(root, '/')) {
+  return !!(await findFile(root, 'yarn.lock', stopDir));
 }
 
 export async function initProject(projectName: string, target: string) {}

package/src/common/emoji.ts

@@ -5,11 +5,11 @@ const supportsEmoji = !isWindows || process.env.TERM === 'xterm-256color';
 // see https://unicode.org/emoji/charts/full-emoji-list.html
 export const liveIcon = supportsEmoji ? '🚀 ' : '>';
 export const settingsIcon = supportsEmoji ? '🔧 ' : '>';
-export const cactusIcon = supportsEmoji ? '👻' : '>';
-export const clapIcon = supportsEmoji ? '👏' : '^';
-export const sparklesIcon = supportsEmoji ? '✨' : '>';
-export const unicornIcon = supportsEmoji ? '🦄' : '>';
-export const caterpillerIcon = supportsEmoji ? '🐛' : '+';
-export const butterflyIcon = supportsEmoji ? '🦋' : '+';
-export const zapIcon = supportsEmoji ? '⚡' : '>';
-export const rainbowIcon = supportsEmoji ? '🌈' : '~';
+export const cactusIcon = supportsEmoji ? '👻 ' : '>';
+export const clapIcon = supportsEmoji ? '👏 ' : '^';
+export const sparklesIcon = supportsEmoji ? '✨ ' : '>';
+export const unicornIcon = supportsEmoji ? '🦄 ' : '>';
+export const caterpillerIcon = supportsEmoji ? '🐛 ' : '+';
+export const butterflyIcon = supportsEmoji ? '🦋 ' : '+';
+export const zapIcon = supportsEmoji ? '⚡ ' : '>';
+export const rainbowIcon = supportsEmoji ? '🌈 ' : '~';

package/src/common/importmap.ts

@@ -1,4 +1,4 @@
-import { resolve, dirname } from 'path';
+import { resolve, dirname, isAbsolute } from 'path';
 import { log, fail } from './log';
 import { satisfies, validate } from './version';
 import { computeHash } from './hash';
@@ -84,6 +84,24 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
         } else {
           fail('importMapReferenceNotFound_0027', dir, identifier);
         }
+      } else if (!url.startsWith('.') && !isAbsolute(url)) {
+        const entry = tryResolvePackage(url, dir);
+
+        if (entry) {
+          const packageJson = await findFile(dirname(entry), 'package.json');
+          const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
+
+          dependencies.push({
+            id: `${identifier}@${version}`,
+            requireId: `${identifier}@${requireVersion}`,
+            entry,
+            name: identifier,
+            ref: `${assetName}.js`,
+            type: 'local',
+          });
+        } else {
+          fail('importMapReferenceNotFound_0027', dir, url);
+        }
       } else {
         const entry = resolve(dir, url);
         const exists = await checkExists(entry);
@@ -140,7 +158,12 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
           const entry = dependencies.find((dep) => dep.name === dependency.name);
 
           if (!entry) {
-            dependencies.push(dependency);
+            dependencies.push({
+              ...dependency,
+              parents: [inheritedImport],
+            });
+          } else if (Array.isArray(entry.parents)) {
+            entry.parents.push(inheritedImport);
           }
         }
       }

package/src/common/io.ts

@@ -187,15 +187,14 @@ export function getFileNames(target: string) {
   });
 }
 
-export async function findFile(topDir: string, fileName: string): Promise<string> {
+export async function findFile(topDir: string, fileName: string, stopDir = resolve(topDir, '/')): Promise<string> {
   const path = join(topDir, fileName);
   const exists = await checkExists(path);
 
   if (!exists) {
-    const parentDir = resolve(topDir, '..');
-
-    if (parentDir !== topDir) {
-      return await findFile(parentDir, fileName);
+    if (topDir !== stopDir) {
+      const parentDir = resolve(topDir, '..');
+      return await findFile(parentDir, fileName, stopDir);
     }
 
     return undefined;

package/src/common/npm.test.ts

@@ -454,12 +454,12 @@ describe('npm Module', () => {
 
   it('makeExternals without externals returns coreExternals', () => {
     const externals = makeExternals(process.cwd(), { piral: '*' });
-    expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'history', 'tslib']);
+    expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
   });
 
   it('makeExternals with no externals returns coreExternals', () => {
     const externals = makeExternals(process.cwd(), { piral: '*' }, []);
-    expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'history', 'tslib']);
+    expect(externals).toEqual(['react', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
   });
 
   it('makeExternals with exclude coreExternals returns empty set', () => {
@@ -476,19 +476,18 @@ describe('npm Module', () => {
       'react-dom',
       'react-router',
       'react-router-dom',
-      'history',
       'tslib',
     ]);
   });
 
   it('makeExternals with external duplicate only reflects coreExternals', () => {
     const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'foo']);
-    expect(externals).toEqual(['react', 'foo', 'react-dom', 'react-router', 'react-router-dom', 'history', 'tslib']);
+    expect(externals).toEqual(['react', 'foo', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
   });
 
   it('makeExternals with explicit include and exclude', () => {
-    const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-calendar', '!history']);
-    expect(externals).toEqual(['react', 'react-calendar', 'react-dom', 'react-router', 'react-router-dom', 'tslib']);
+    const externals = makeExternals(process.cwd(), { piral: '*' }, ['react', 'react-calendar', '!tslib']);
+    expect(externals).toEqual(['react', 'react-calendar', 'react-dom', 'react-router', 'react-router-dom']);
   });
 
   it('makeExternals with all exclude and explicit include', () => {

package/src/common/package.ts

@@ -12,7 +12,15 @@ import { getHash, checkIsDirectory, matchFiles } from './io';
 import { readJson, copy, updateExistingJson, findFile, checkExists } from './io';
 import { isGitPackage, isLocalPackage, makeGitUrl, makeFilePath } from './npm';
 import { makePiletExternals, makeExternals, findPackageRoot } from './npm';
-import { SourceLanguage, Framework, FileInfo, PiletsInfo, TemplateFileLocation, PackageData } from '../types';
+import {
+  SourceLanguage,
+  Framework,
+  FileInfo,
+  PiletsInfo,
+  TemplateFileLocation,
+  PackageData,
+  SharedDependency,
+} from '../types';
 
 function appendBundler(devDependencies: Record<string, string>, bundler: string, version: string) {
   if (bundler && bundler !== 'none') {
@@ -182,7 +190,6 @@ export function getPiralPackage(app: string, data: PiralPackageData, version: st
         framework === 'piral-native' && 'piral-native', // this we also only take if we selected piral-native
       ].filter(Boolean),
     },
-    pilets: getPiletsInfo({}),
     dependencies,
     devDependencies,
   };
@@ -501,10 +508,6 @@ export async function patchPiletPackage(
 ) {
   log('generalDebug_0003', `Patching the package.json in "${root}" ...`);
   const { externals, packageOverrides, ...info } = getPiletsInfo(piralInfo);
-  const piral = {
-    comment: 'Keep this section to use the Piral CLI.',
-    name,
-  };
   const piralDependencies = {
     ...piralInfo.devDependencies,
     ...piralInfo.dependencies,
@@ -548,8 +551,7 @@ export async function patchPiletPackage(
     appendBundler(devDependencies, bundler, version);
   }
 
-  const packageContent = deepMerge(packageOverrides, {
-    piral,
+  await updateExistingJson(root, 'package.json', deepMerge(packageOverrides, {
     importmap: {
       imports: {},
       inherit: [name],
@@ -559,10 +561,16 @@ export async function patchPiletPackage(
       [name]: undefined,
     },
     scripts,
-  });
+  }));
 
-  await updateExistingJson(root, 'package.json', packageContent);
   log('generalDebug_0003', `Succesfully patched the package.json.`);
+
+  await updateExistingJson(root, 'pilet.json', {
+    piralInstances: {
+      [name]: {},
+    },
+  });
+  log('generalDebug_0003', `Succesfully patched the pilet.json.`);
 }
 
 /**
@@ -580,6 +588,34 @@ export function checkAppShellPackage(appPackage: PackageData) {
   return false;
 }
 
+export function combinePiletExternals(
+  appShells: Array<string>,
+  peerDependencies: Record<string, string>,
+  peerModules: Array<string>,
+  importmap: Array<SharedDependency>,
+) {
+  const externals = [...Object.keys(peerDependencies), ...peerModules];
+
+  for (let i = importmap.length; i--; ) {
+    const entry = importmap[i];
+
+    // if the entry has no parents, i.e., it was explicitly mentioned in the importmap
+    // then keep it in the importmap (=> prefer the distributed approach, which will always work)
+    if (Array.isArray(entry.parents)) {
+      // only accept entry as a centrally shared dependency if the entry appears in all
+      // mentioned / referenced app shells
+      // in other cases (e.g., if one app shell does not share this) use the distributed
+      // mechanism to ensure that the dependency can also be resolved in this shell
+      if (appShells.every((app) => entry.parents.includes(app))) {
+        externals.push(entry.name);
+        importmap.splice(i, 1);
+      }
+    }
+  }
+
+  return externals;
+}
+
 export async function retrievePiletData(target: string, app?: string) {
   const packageJson = await findFile(target, 'package.json');
 

package/src/types/common.ts

@@ -84,6 +84,7 @@ export interface SharedDependency {
   ref: string;
   type: 'local' | 'remote';
   entry: string;
+  parents?: Array<string>;
 }
 
 export interface RuleRunner<T extends RuleContext> {