Fixed smaller issues

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Piral Changelog
 
+## 0.15.7 (tbd)
+
+- Fixed inconsistency with `pilet build` using explicit target while `pilet publish` using `main` from *package.json*
+- Fixed reference to `piral-cli` in `piral-jest-utils`
+
 ## 0.15.6 (January 30, 2023)
 
 - Fixed issue in `piral-cli` using the bundler without standard input (#575)

src/tooling/piral-cli/src/apps/publish-pilet.ts

@@ -1,4 +1,4 @@
-import { relative, dirname, basename, resolve } from 'path';
+import { relative, dirname, basename, resolve, isAbsolute } from 'path';
 import { callPiletBuild } from '../bundler';
 import { LogLevels, PiletSchemaVersion, PiletPublishSource, PiletPublishScheme } from '../types';
 import {
@@ -113,6 +113,11 @@ export const publishPiletDefaults: PublishPiletOptions = {
   interactive: false,
 };
 
+function isSubDir(parent: string, dir: string) {
+  const rel = relative(parent, dir);
+  return rel && !rel.startsWith('..') && !isAbsolute(rel);
+}
+
 async function getFiles(
   baseDir: string,
   sources: Array<string>,
@@ -135,24 +140,27 @@ async function getFiles(
     return await Promise.all(
       allEntries.map(async (entryModule) => {
         const targetDir = dirname(entryModule);
+
+        progress('Triggering pilet build ...');
         const { root, piletPackage, importmap, peerDependencies, peerModules, apps } = await retrievePiletData(
           targetDir,
         );
         const piralInstances = apps.map((m) => m.appPackage.name);
         const { main = 'dist/index.js', name = 'pilet' } = piletPackage;
-        const dest = resolve(root, main);
+        const propDest = resolve(root, main);
+        log('generalDebug_0003', `Pilet "${name}" is supposed to generate artifact in "${propDest}".`);
+        const usePropDest = dirname(propDest) !== root && isSubDir(root, propDest);
+        const dest = usePropDest ? propDest : resolve(root, 'dist');
+        log('generalDebug_0003', `Pilet "${name}" is generating artifact in "${dest}".`);
         const outDir = dirname(dest);
         const outFile = basename(dest);
         const externals = combinePiletExternals(piralInstances, peerDependencies, peerModules, importmap);
-        progress('Triggering pilet build ...');
+        log('generalDebug_0003', `Pilet "${name}" uses externals: ${externals.join(', ')}.`);
 
-        if (fresh) {
-          progress('Removing output directory ...');
-          await removeDirectory(outDir);
-        }
+        progress('Removing output directory ...');
+        await removeDirectory(outDir);
 
         logInfo('Bundle pilet ...');
-
         await callPiletBuild(
           {
             root,

src/utilities/piral-jest-utils/package.json

@@ -50,8 +50,9 @@
   "scripts": {
     "cleanup": "rimraf esm lib",
     "build": "yarn build:commonjs && yarn build:esnext",
-    "build:commonjs": "tsc --project tsconfig.json --outDir lib --module commonjs",
-    "build:esnext": "tsc --project tsconfig.json --outDir esm --module esnext",
+    "build:commonjs": "tsc --project tsconfig.json --outDir lib --module commonjs && yarn build:external --outfile=lib/utils.js --format=cjs",
+    "build:esnext": "tsc --project tsconfig.json --outDir esm --module esnext && yarn build:external --outfile=esm/utils.js --format=esm",
+    "build:external": "esbuild src/utils.ts --bundle --platform=node",
     "typedoc": "typedoc --json ../../../docs/types/piral-jest-utils.json src --exclude \"src/**/*.test.*\"",
     "test": "echo \"Error: run tests from root\" && exit 1"
   },

src/utilities/piral-jest-utils/src/index.ts

@@ -1,5 +1,5 @@
-import { deepMerge } from 'piral-cli/utils';
 import type { Config } from '@jest/types';
+import { deepMerge } from './utils';
 import defaultConfig from './config';
 
 function extendConfig(userConfig: Config.InitialOptions) {

src/utilities/piral-jest-utils/src/utils.ts

@@ -0,0 +1 @@
+export { deepMerge } from 'piral-cli/src/common/merge';