piral-cli 0.15.6-beta.5109 → 0.15.7-beta.5126

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -27,6 +27,10 @@ exports.publishPiletDefaults = {
27
27
  headers: {},
28
28
  interactive: false,
29
29
  };
30
+ function isSubDir(parent, dir) {
31
+ const rel = (0, path_1.relative)(parent, dir);
32
+ return rel && !rel.startsWith('..') && !(0, path_1.isAbsolute)(rel);
33
+ }
30
34
  function getFiles(baseDir, sources, from, fresh, schemaVersion, logLevel, bundlerName, _, ca) {
31
35
  return __awaiter(this, void 0, void 0, function* () {
32
36
  if (fresh) {
@@ -37,18 +41,21 @@ function getFiles(baseDir, sources, from, fresh, schemaVersion, logLevel, bundle
37
41
  }
38
42
  return yield Promise.all(allEntries.map((entryModule) => __awaiter(this, void 0, void 0, function* () {
39
43
  const targetDir = (0, path_1.dirname)(entryModule);
44
+ (0, common_1.progress)('Triggering pilet build ...');
40
45
  const { root, piletPackage, importmap, peerDependencies, peerModules, apps } = yield (0, common_1.retrievePiletData)(targetDir);
41
46
  const piralInstances = apps.map((m) => m.appPackage.name);
42
47
  const { main = 'dist/index.js', name = 'pilet' } = piletPackage;
43
- const dest = (0, path_1.resolve)(root, main);
48
+ const propDest = (0, path_1.resolve)(root, main);
49
+ (0, common_1.log)('generalDebug_0003', `Pilet "${name}" is supposed to generate artifact in "${propDest}".`);
50
+ const usePropDest = (0, path_1.dirname)(propDest) !== root && isSubDir(root, propDest);
51
+ const dest = usePropDest ? propDest : (0, path_1.resolve)(root, 'dist');
52
+ (0, common_1.log)('generalDebug_0003', `Pilet "${name}" is generating artifact in "${dest}".`);
44
53
  const outDir = (0, path_1.dirname)(dest);
45
54
  const outFile = (0, path_1.basename)(dest);
46
55
  const externals = (0, common_1.combinePiletExternals)(piralInstances, peerDependencies, peerModules, importmap);
47
- (0, common_1.progress)('Triggering pilet build ...');
48
- if (fresh) {
49
- (0, common_1.progress)('Removing output directory ...');
50
- yield (0, common_1.removeDirectory)(outDir);
51
- }
56
+ (0, common_1.log)('generalDebug_0003', `Pilet "${name}" uses externals: ${externals.join(', ')}.`);
57
+ (0, common_1.progress)('Removing output directory ...');
58
+ yield (0, common_1.removeDirectory)(outDir);
52
59
  (0, common_1.logInfo)('Bundle pilet ...');
53
60
  yield (0, bundler_1.callPiletBuild)({
54
61
  root,
@@ -1 +1 @@
1
- {"version":3,"file":"publish-pilet.js","sourceRoot":"","sources":["../../src/apps/publish-pilet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"publish-pilet.js","sourceRoot":"","sources":["../../src/apps/publish-pilet.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "0.15.6-beta.5109",
3
+ "version": "0.15.7-beta.5126",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -80,5 +80,5 @@
80
80
  "typescript": "^4.0.0",
81
81
  "yargs": "^15.0.0"
82
82
  },
83
- "gitHead": "e944c2737f6ede8187b599509961f2314d2534c3"
83
+ "gitHead": "e23df08a2bcf0540974ac610ede2c9030fddcb82"
84
84
  }
@@ -1,4 +1,4 @@
1
- import { relative, dirname, basename, resolve } from 'path';
1
+ import { relative, dirname, basename, resolve, isAbsolute } from 'path';
2
2
  import { callPiletBuild } from '../bundler';
3
3
  import { LogLevels, PiletSchemaVersion, PiletPublishSource, PiletPublishScheme } from '../types';
4
4
  import {
@@ -113,6 +113,11 @@ export const publishPiletDefaults: PublishPiletOptions = {
113
113
  interactive: false,
114
114
  };
115
115
 
116
+ function isSubDir(parent: string, dir: string) {
117
+ const rel = relative(parent, dir);
118
+ return rel && !rel.startsWith('..') && !isAbsolute(rel);
119
+ }
120
+
116
121
  async function getFiles(
117
122
  baseDir: string,
118
123
  sources: Array<string>,
@@ -135,24 +140,27 @@ async function getFiles(
135
140
  return await Promise.all(
136
141
  allEntries.map(async (entryModule) => {
137
142
  const targetDir = dirname(entryModule);
143
+
144
+ progress('Triggering pilet build ...');
138
145
  const { root, piletPackage, importmap, peerDependencies, peerModules, apps } = await retrievePiletData(
139
146
  targetDir,
140
147
  );
141
148
  const piralInstances = apps.map((m) => m.appPackage.name);
142
149
  const { main = 'dist/index.js', name = 'pilet' } = piletPackage;
143
- const dest = resolve(root, main);
150
+ const propDest = resolve(root, main);
151
+ log('generalDebug_0003', `Pilet "${name}" is supposed to generate artifact in "${propDest}".`);
152
+ const usePropDest = dirname(propDest) !== root && isSubDir(root, propDest);
153
+ const dest = usePropDest ? propDest : resolve(root, 'dist');
154
+ log('generalDebug_0003', `Pilet "${name}" is generating artifact in "${dest}".`);
144
155
  const outDir = dirname(dest);
145
156
  const outFile = basename(dest);
146
157
  const externals = combinePiletExternals(piralInstances, peerDependencies, peerModules, importmap);
147
- progress('Triggering pilet build ...');
158
+ log('generalDebug_0003', `Pilet "${name}" uses externals: ${externals.join(', ')}.`);
148
159
 
149
- if (fresh) {
150
- progress('Removing output directory ...');
151
- await removeDirectory(outDir);
152
- }
160
+ progress('Removing output directory ...');
161
+ await removeDirectory(outDir);
153
162
 
154
163
  logInfo('Bundle pilet ...');
155
-
156
164
  await callPiletBuild(
157
165
  {
158
166
  root,