piral-cli 0.14.3-beta.3295 → 0.14.3-beta.3303

package/src/apps/build-piral.ts

@@ -194,11 +194,16 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
     await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, targetDir, name });
 
     logInfo(`Bundle ${emulatorName} ...`);
-    const { dir: outDir, name: outFile, hash } = await callPiralBuild(
+    const {
+      dir: outDir,
+      name: outFile,
+      hash,
+    } = await callPiralBuild(
       {
         root,
         piral: name,
         emulator: true,
+        standalone: false,
         optimizeModules,
         sourceMaps,
         contentHash,
@@ -219,11 +224,11 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
 
     await runLifecycle(root, scripts, 'piral:postbuild');
     await runLifecycle(root, scripts, `piral:postbuild-${emulatorName}`);
-    
+
     await hooks.beforeEmulator?.({ root, externals, targetDir, outDir });
 
     const rootDir = await createEmulatorSources(root, outDir, outFile, logLevel);
-    
+
     await hooks.afterEmulator?.({ root, externals, targetDir, outDir, rootDir });
 
     if (type !== emulatorSourcesName) {
@@ -247,14 +252,19 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
     await removeDirectory(targetDir);
 
     logInfo(`Bundle ${releaseName} ...`);
-    
+
     await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, targetDir, name });
 
-    const { dir: outDir, name: outFile, hash } = await callPiralBuild(
+    const {
+      dir: outDir,
+      name: outFile,
+      hash,
+    } = await callPiralBuild(
       {
         root,
         piral: name,
         emulator: false,
+        standalone: false,
         optimizeModules,
         sourceMaps,
         contentHash,
@@ -270,7 +280,7 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
       },
       bundlerName,
     );
-    
+
     await hooks.afterBuild?.({ root, publicUrl, externals, entryFiles, targetDir, name, outDir, outFile, hash });
 
     await runLifecycle(root, scripts, 'piral:postbuild');

package/src/apps/publish-pilet.ts

@@ -1,5 +1,5 @@
-import { relative, join, dirname, basename, resolve } from 'path';
-import { buildPilet } from './build-pilet';
+import { relative, dirname, basename, resolve } from 'path';
+import { callPiletBuild } from '../bundler';
 import { LogLevels, PiletSchemaVersion, PiletPublishSource } from '../types';
 import {
   postFile,
@@ -15,6 +15,10 @@ import {
   checkExists,
   findTarball,
   downloadFile,
+  matchAnyPilet,
+  retrievePiletData,
+  removeDirectory,
+  logInfo,
 } from '../common';
 
 export interface PublishPiletOptions {
@@ -67,6 +71,16 @@ export interface PublishPiletOptions {
    * Places additional fields that should be posted to the feed service.
    */
   fields?: Record<string, string>;
+
+  /**
+   * Sets the bundler to use for building, if any specific.
+   */
+  bundlerName?: string;
+
+  /**
+   * Additional arguments for a specific bundler.
+   */
+  _?: Record<string, any>;
 }
 
 export const publishPiletDefaults: PublishPiletOptions = {
@@ -87,22 +101,69 @@ async function getFiles(
   from: PiletPublishSource,
   fresh: boolean,
   schemaVersion: PiletSchemaVersion,
+  logLevel: LogLevels,
+  bundlerName: string,
+  _?: Record<string, any>,
   ca?: Buffer,
 ): Promise<Array<string>> {
   if (fresh) {
     log('generalDebug_0003', 'Detected "--fresh". Trying to resolve the package.json.');
-    const details = require(join(baseDir, 'package.json'));
-    progress('Triggering pilet build ...');
-    await buildPilet(baseDir, {
-      target: details.main,
-      fresh,
-      schemaVersion,
-    });
-    log('generalDebug_0003', 'Successfully built.');
-    progress('Triggering pilet pack ...');
-    const file = await createPiletPackage(baseDir, '.', '.');
-    log('generalDebug_0003', 'Successfully packed.');
-    return [file];
+    const allEntries = await matchAnyPilet(baseDir, sources);
+
+    if (allEntries.length === 0) {
+      fail('entryFileMissing_0077');
+    }
+
+    return await Promise.all(
+      allEntries.map(async (entryModule) => {
+        const targetDir = dirname(entryModule);
+        const { root, piletPackage, importmap, peerDependencies, peerModules, appPackage } = await retrievePiletData(
+          targetDir,
+        );
+        const dest = resolve(root, piletPackage.main);
+        const outDir = dirname(dest);
+        const outFile = basename(dest);
+        const externals = [...Object.keys(peerDependencies), ...peerModules];
+        progress('Triggering pilet build ...');
+
+        if (fresh) {
+          progress('Removing output directory ...');
+          await removeDirectory(outDir);
+        }
+
+        logInfo('Bundle pilet ...');
+
+        await callPiletBuild(
+          {
+            root,
+            piral: appPackage.name,
+            optimizeModules: false,
+            sourceMaps: true,
+            contentHash: true,
+            minify: true,
+            externals,
+            targetDir,
+            importmap,
+            outFile,
+            outDir,
+            entryModule: `./${relative(root, entryModule)}`,
+            logLevel,
+            version: schemaVersion,
+            ignored: [],
+            _,
+          },
+          bundlerName,
+        );
+
+        log('generalDebug_0003', `Pilet "${piletPackage.name}" built successfully!`);
+        progress('Triggering pilet pack ...');
+
+        const file = await createPiletPackage(root, '.', '.');
+        log('generalDebug_0003', `Pilet "${piletPackage.name}" packed successfully!`);
+
+        return file;
+      }),
+    );
   } else {
     log('generalDebug_0003', `Did not find fresh flag. Trying to match from "${from}".`);
 
@@ -139,6 +200,8 @@ export async function publishPilet(baseDir = process.cwd(), options: PublishPile
     schemaVersion = publishPiletDefaults.schemaVersion,
     cert = config.cert ?? publishPiletDefaults.cert,
     fields = publishPiletDefaults.fields,
+    _ = {},
+    bundlerName,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   setLogLevel(logLevel);
@@ -160,7 +223,7 @@ export async function publishPilet(baseDir = process.cwd(), options: PublishPile
 
   log('generalDebug_0003', 'Getting the tgz files ...');
   const sources = Array.isArray(source) ? source : [source];
-  const files = await getFiles(fullBase, sources, from, fresh, schemaVersion, ca);
+  const files = await getFiles(fullBase, sources, from, fresh, schemaVersion, logLevel, bundlerName, _, ca);
   const successfulUploads: Array<string> = [];
   log('generalDebug_0003', 'Received available tgz files.');
 

package/src/apps/publish-piral.ts

@@ -93,7 +93,7 @@ export async function publishPiral(baseDir = process.cwd(), options: PublishPira
   if (type === 'emulator-sources') {
     fail('publishEmulatorSourcesInvalid_0114');
   }
-  
+
   progress('Reading configuration ...');
 
   if (type !== 'release') {

package/src/build/run-build-piral.ts

@@ -7,6 +7,7 @@ function run(
   root: string,
   piral: string,
   emulator: boolean,
+  standalone: boolean,
   sourceMaps: boolean,
   contentHash: boolean,
   minify: boolean,
@@ -22,7 +23,7 @@ function run(
     production: !emulator,
     root,
     debugPiral: emulator,
-    debugPilet: emulator,
+    debugPilet: emulator || standalone,
     piral,
     dependencies: externals,
   });
@@ -56,6 +57,7 @@ process.on('message', async (msg) => {
           process.cwd(),
           msg.piral,
           msg.emulator,
+          msg.standalone,
           msg.sourceMaps,
           msg.contentHash,
           msg.minify,

package/src/commands.ts

@@ -573,6 +573,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .choices('schema', schemaKeys)
         .describe('schema', 'Sets the schema to be used when making a fresh build of the pilet.')
         .default('schema', apps.publishPiletDefaults.schemaVersion)
+        .choices('bundler', availableBundlers)
+        .describe('bundler', 'Sets the bundler to use.')
+        .default('bundler', availableBundlers[0])
         .choices('from', fromKeys)
         .describe('from', 'Sets the type of the source to use for publishing.')
         .default('from', apps.publishPiletDefaults.from)
@@ -590,10 +593,12 @@ const allCommands: Array<ToolCommand<any>> = [
         url: args.url as string,
         logLevel: args['log-level'] as LogLevels,
         cert: args['ca-cert'] as string,
+        bundlerName: args.bundler as string,
         fresh: args.fresh as boolean,
         from: args.from as PiletPublishSource,
         schemaVersion: args.schema as PiletSchemaVersion,
         fields: args.fields as Record<string, string>,
+        _: args,
       });
     },
   },

package/src/common/constants.ts

@@ -2,6 +2,7 @@ export const defaultRegistry = 'https://registry.npmjs.org/';
 export const filesTar = 'files';
 export const filesOnceTar = 'files_once';
 export const piralBaseRoot = 'piral-base/lib/types';
+export const frameworkLibs = ['piral', 'piral-core', 'piral-base'];
 export const entryModuleExtensions = ['.ts', '.tsx', '.js', '.jsx'];
 export const declarationEntryExtensions = ['.html', '.pug', ...entryModuleExtensions];
 export const legacyCoreExternals = [

package/src/common/declaration.ts

@@ -1,7 +1,6 @@
 import { DeclOptions, generateDeclaration, createExcludePlugin, Logger } from 'dets';
 import { dirname, basename, resolve, extname } from 'path';
 import { progress, log, logWarn, logVerbose, logInfo } from './log';
-import { makeExternals } from './npm';
 import { ForceOverwrite } from './enums';
 import { retrievePiralRoot, retrievePiletsInfo } from './package';
 import { entryModuleExtensions, piralBaseRoot } from './constants';
@@ -132,7 +131,6 @@ export async function createPiralDeclaration(
   progress('Reading configuration ...');
   const entryFiles = await retrievePiralRoot(baseDir, entry);
   const { name, root, externals } = await retrievePiletsInfo(entryFiles);
-  const allowedImports = makeExternals(externals);
   const entryModules = await getEntryModules(entryFiles);
   const files = await getAllFiles(entryModules);
   const options: DeclOptions = {
@@ -146,7 +144,7 @@ export async function createPiralDeclaration(
         name: 'PiletApi',
       },
     ],
-    imports: allowedImports,
+    imports: externals,
     logLevel,
     logger: createLogger(),
   };

package/src/common/emulator.ts

@@ -27,7 +27,11 @@ export async function createEmulatorSources(
 ) {
   const piralPkg = require(resolve(sourceDir, packageJson));
   const files: Array<string | TemplateFileLocation> = piralPkg.pilets?.files ?? [];
-  const allExternals = makeExternals(piralPkg.pilets?.externals);
+  const allDeps = {
+    ...piralPkg.devDependencies,
+    ...piralPkg.dependencies,
+  };
+  const allExternals = makeExternals(allDeps, piralPkg.pilets?.externals);
 
   const externalPackages = await Promise.all(
     allExternals.filter(isValidDependency).map(async (name) => ({
@@ -79,8 +83,7 @@ export async function createEmulatorSources(
     app: `./${appDir}/index.html`,
     peerDependencies: {},
     devDependencies: {
-      ...piralPkg.devDependencies,
-      ...piralPkg.dependencies,
+      ...allDeps,
       ...externalDependencies,
     },
     sharedDependencies: allExternals,

package/src/common/envs.ts

@@ -1,5 +1,6 @@
 import { join } from 'path';
 import { log } from './log';
+import { frameworkLibs } from './constants';
 import { pathSeparator, cliVersion, compatVersion } from './info';
 import { StandardEnvProps } from '../types';
 
@@ -43,7 +44,7 @@ export function setStandardEnvs(options: StandardEnvProps) {
   }
 
   if (options.dependencies && options.dependencies.length) {
-    const excludedDependencies = ['piral', 'piral-core', 'piral-base', options.piral];
+    const excludedDependencies = [...frameworkLibs, options.piral];
     const dependencies = options.dependencies.filter((m) => !excludedDependencies.includes(m));
     process.env.SHARED_DEPENDENCIES = dependencies.join(',');
   } else {

package/src/common/io.ts

@@ -420,10 +420,20 @@ export async function copy(source: string, target: string, forceOverwrite = Forc
 
   try {
     const flag = forceOverwrite === ForceOverwrite.yes ? 0 : constants.COPYFILE_EXCL;
-    await new Promise<void>((resolve, reject) => {
-      copyFile(source, target, flag, (err) => (err ? reject(err) : resolve()));
-    });
-    return true;
+    const isDir = await checkIsDirectory(source);
+
+    if (isDir) {
+      const files = await getFileNames(source);
+      const results = await Promise.all(
+        files.map((file) => copy(resolve(source, file), resolve(target, file), forceOverwrite)),
+      );
+      return results.every(Boolean);
+    } else {
+      await new Promise<void>((resolve, reject) => {
+        copyFile(source, target, flag, (err) => (err ? reject(err) : resolve()));
+      });
+      return true;
+    }
   } catch (e) {
     if (forceOverwrite === ForceOverwrite.prompt) {
       const shouldOverwrite = await promptOverwrite(target);

package/src/common/npm.test.ts

@@ -407,7 +407,7 @@ describe('npm Module', () => {
   });
 
   it('makeExternals without externals returns coreExternals', () => {
-    const externals = makeExternals();
+    const externals = makeExternals({ piral: '*' });
     expect(externals).toEqual([
       'react',
       'react-dom',
@@ -422,7 +422,7 @@ describe('npm Module', () => {
   });
 
   it('makeExternals with no externals returns coreExternals', () => {
-    const externals = makeExternals([]);
+    const externals = makeExternals({ piral: '*' }, []);
     expect(externals).toEqual([
       'react',
       'react-dom',
@@ -437,12 +437,12 @@ describe('npm Module', () => {
   });
 
   it('makeExternals with exclude coreExternals returns empty set', () => {
-    const externals = makeExternals(['!*']);
+    const externals = makeExternals({ piral: '*' }, ['!*']);
     expect(externals).toEqual([]);
   });
 
   it('makeExternals with externals concats coreExternals', () => {
-    const externals = makeExternals(['foo', 'bar']);
+    const externals = makeExternals({ piral: '*' }, ['foo', 'bar']);
     expect(externals).toEqual([
       'foo',
       'bar',
@@ -459,7 +459,7 @@ describe('npm Module', () => {
   });
 
   it('makeExternals with external duplicate only reflects coreExternals', () => {
-    const externals = makeExternals(['react', 'foo']);
+    const externals = makeExternals({ piral: '*' }, ['react', 'foo']);
     expect(externals).toEqual([
       'react',
       'foo',
@@ -475,7 +475,7 @@ describe('npm Module', () => {
   });
 
   it('makeExternals with explicit include and exclude', () => {
-    const externals = makeExternals(['react', 'react-calendar', '!history']);
+    const externals = makeExternals({ piral: '*' }, ['react', 'react-calendar', '!history']);
     expect(externals).toEqual([
       'react',
       'react-calendar',
@@ -490,7 +490,7 @@ describe('npm Module', () => {
   });
 
   it('makeExternals with all exclude and explicit include', () => {
-    const externals = makeExternals(['react', 'react-router-dom', '!*']);
+    const externals = makeExternals({ piral: '*' }, ['react', 'react-router-dom', '!*']);
     expect(externals).toEqual(['react', 'react-router-dom']);
   });
 });

package/src/common/npm.ts

@@ -7,6 +7,7 @@ import { inspectPackage } from './inspect';
 import { readJson, checkExists, findFile } from './io';
 import { clientTypeKeys } from '../helpers';
 import { PackageType, NpmClientType } from '../types';
+import { frameworkLibs } from '.';
 
 const gitPrefix = 'git+';
 const filePrefix = 'file:';
@@ -421,25 +422,44 @@ export function getPackageVersion(
   }
 }
 
-export function getCoreExternals(): Array<string> {
+function getExternalsFrom(packageName: string): Array<string> | undefined {
   try {
-    return require('piral-core/package.json').sharedDependencies || [];
+    return require(`${packageName}/package.json`).sharedDependencies;
   } catch {
-    return [];
+    return undefined;
   }
 }
 
-export function makePiletExternals(externals: Array<string>, fromEmulator: boolean, piralInfo: any) {
+function getCoreExternals(dependencies: Record<string, string>): Array<string> {
+  for (const frameworkLib of frameworkLibs) {
+    if (dependencies[frameworkLib]) {
+      const deps = getExternalsFrom(frameworkLib);
+
+      if (deps) {
+        return deps;
+      }
+    }
+  }
+
+  return [];
+}
+
+export function makePiletExternals(
+  dependencies: Record<string, string>,
+  externals: Array<string>,
+  fromEmulator: boolean,
+  piralInfo: any,
+) {
   if (fromEmulator) {
-    const { sharedDependencies = makeExternals(externals, true) } = piralInfo;
+    const { sharedDependencies = makeExternals(dependencies, externals, true) } = piralInfo;
     return sharedDependencies;
   } else {
-    return makeExternals(externals);
+    return makeExternals(dependencies, externals);
   }
 }
 
-export function makeExternals(externals?: Array<string>, legacy = false) {
-  const coreExternals = legacy ? legacyCoreExternals : getCoreExternals();
+export function makeExternals(dependencies: Record<string, string>, externals?: Array<string>, legacy = false) {
+  const coreExternals = legacy ? legacyCoreExternals : getCoreExternals(dependencies);
 
   if (externals && Array.isArray(externals)) {
     const [include, exclude] = externals.reduce<[Array<string>, Array<string>]>(

package/src/common/package.test.ts

@@ -1,11 +1,5 @@
 import { resolve } from 'path';
-import {
-  findPackageVersion,
-  findPackageRoot,
-  getPiralPackage,
-  getPiletsInfo,
-  retrievePiletData,
-} from './package';
+import { findPackageVersion, findPackageRoot, getPiralPackage, getPiletsInfo, retrievePiletData } from './package';
 import { cliVersion } from './info';
 import { SourceLanguage } from './enums';
 

package/src/common/package.ts

@@ -442,8 +442,12 @@ export async function retrievePiletsInfo(entryFile: string) {
   }
 
   const packageInfo = require(packageJson);
+  const allDeps = {
+    ...packageInfo.devDependencies,
+    ...packageInfo.dependencies,
+  };
   const info = getPiletsInfo(packageInfo);
-  const externals = makeExternals(info.externals);
+  const externals = makeExternals(allDeps, info.externals);
 
   return {
     ...info,
@@ -495,7 +499,7 @@ export async function patchPiletPackage(
       }
     : info.scripts;
   const peerModules = [];
-  const allExternals = makePiletExternals(externals, fromEmulator, piralInfo);
+  const allExternals = makePiletExternals(piralDependencies, externals, fromEmulator, piralInfo);
   const peerDependencies = {
     ...allExternals.reduce((deps, name) => {
       const valid = isValidDependency(name);

package/src/helpers.ts

@@ -11,7 +11,7 @@ import {
 export const schemaKeys: Array<PiletSchemaVersion> = ['v0', 'v1', 'v2', 'none'];
 export const fromKeys: Array<PiletPublishSource> = ['local', 'remote', 'npm'];
 export const piralBuildTypeKeys: Array<PiralBuildType> = ['all', 'release', 'emulator', 'emulator-sources'];
-export const piletBuildTypeKeys: Array<PiletBuildType> = ['default', 'standalone'];
+export const piletBuildTypeKeys: Array<PiletBuildType> = ['default', 'standalone', 'manifest'];
 export const clientTypeKeys: Array<NpmClientType> = ['npm', 'pnpm', 'yarn'];
 export const bundlerKeys: Array<string> = ['none', 'parcel', 'webpack', 'webpack5', 'esbuild'];
 export const availableBundlers: Array<string> = [];

package/src/types/public.ts

@@ -85,6 +85,7 @@ export interface WatchPiralParameters extends BaseBundleParameters {
 export interface BuildPiralParameters extends BaseBundleParameters {
   piral: string;
   emulator: boolean;
+  standalone: boolean;
   sourceMaps: boolean;
   contentHash: boolean;
   minify: boolean;
@@ -217,7 +218,7 @@ export type PiletPublishSource = 'local' | 'npm' | 'remote';
 
 export type PiralBuildType = 'all' | 'release' | 'emulator' | 'emulator-sources';
 
-export type PiletBuildType = 'default' | 'standalone';
+export type PiletBuildType = 'default' | 'standalone' | 'manifest';
 
 export type PackageType = 'registry' | 'file' | 'git';