piral-cli 1.8.3-beta.7916 → 1.8.3-beta.7922

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.
Files changed (11) hide show
  1. package/lib/apps/new-pilet.js +1 -1
  2. package/lib/apps/new-pilet.js.map +1 -1
  3. package/lib/apps/upgrade-pilet.js +1 -1
  4. package/lib/apps/upgrade-pilet.js.map +1 -1
  5. package/lib/common/package.d.ts +2 -2
  6. package/lib/common/package.js +18 -3
  7. package/lib/common/package.js.map +1 -1
  8. package/package.json +2 -2
  9. package/src/apps/new-pilet.ts +1 -1
  10. package/src/apps/upgrade-pilet.ts +1 -1
  11. package/src/common/package.ts +22 -2
package/lib/apps/new-pilet.js CHANGED
@@ -74,7 +74,7 @@ always-auth=true`, forceOverwrite);
74
74
  }
75
75
  (0, common_1.progress)(`Taking care of templating ...`);
76
76
  const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
77
- await (0, common_1.patchPiletPackage)(root, piralInfo, isEmulator, {
77
+ await (0, common_1.patchPiletPackage)(root, piralInfo, isEmulator, npmClient, {
78
78
  language,
79
79
  bundler: bundlerName,
80
80
  });
package/lib/apps/new-pilet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}
package/lib/apps/upgrade-pilet.js CHANGED
@@ -79,7 +79,7 @@ async function upgradePilet(baseDir = process.cwd(), options = {}) {
79
79
  const notOnceFiles = files.filter((m) => typeof m === 'string' || !m.once);
80
80
  await (0, common_1.copyScaffoldingFiles)(packageRoot, root, notOnceFiles, piralInfo, data);
81
81
  }
82
- await (0, common_1.patchPiletPackage)(root, piralInfo, isEmulator);
82
+ await (0, common_1.patchPiletPackage)(root, piralInfo, isEmulator, npmClient);
83
83
  if (install) {
84
84
  (0, common_1.progress)(`Updating dependencies ...`);
85
85
  await (0, common_1.installNpmDependencies)(npmClient, root);
package/lib/apps/upgrade-pilet.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade-pilet.js","sourceRoot":"","sources":["../../src/apps/upgrade-pilet.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upgrade-pilet.js","sourceRoot":"","sources":["../../src/apps/upgrade-pilet.ts"],"names":[],"mappings":"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"}
package/lib/common/package.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Agent } from 'https';
2
2
  import { ForceOverwrite } from './enums';
3
- import { PiletsInfo, SharedDependency, PiletDefinition, AppDefinition } from '../types';
3
+ import { PiletsInfo, SharedDependency, PiletDefinition, AppDefinition, NpmClient } from '../types';
4
4
  import { SourceLanguage, PiralInstancePackageData, PiralInstanceDetails } from '../types';
5
5
  import { Framework, FileInfo, TemplateFileLocation, PiletPackageData, PiralPackageData } from '../types';
6
6
  export interface PiralInstanceData {
@@ -74,7 +74,7 @@ export declare function retrievePiletsInfo(entryFile: string): Promise<{
74
74
  }>;
75
75
  export declare function validateSharedDependencies(externals: Array<SharedDependency>): void;
76
76
  export declare function isValidDependency(name: string): boolean;
77
- export declare function patchPiletPackage(root: string, piralInfo: PiralPackageData, fromEmulator: boolean, newInfo?: {
77
+ export declare function patchPiletPackage(root: string, piralInfo: PiralPackageData, fromEmulator: boolean, client: NpmClient, newInfo?: {
78
78
  language: SourceLanguage;
79
79
  bundler: string;
80
80
  }): Promise<void>;
package/lib/common/package.js CHANGED
@@ -498,19 +498,30 @@ function isValidDependency(name) {
498
498
  // just to filter out things like "redux-saga/effects" and "@scope/redux-saga/effects"
499
499
  return name.indexOf('/') === -1 || (name.indexOf('@') === 0 && name.split('/').length < 3);
500
500
  }
501
- async function patchPiletPackage(root, piralInfo, fromEmulator, newInfo) {
501
+ async function patchPiletPackage(root, piralInfo, fromEmulator, client, newInfo) {
502
502
  (0, log_1.log)('generalDebug_0003', `Patching the ${constants_1.packageJson} in "${root}" ...`);
503
- const pkg = await getPiletPackage(root, piralInfo, fromEmulator, newInfo);
503
+ const pkg = await getPiletPackage(root, piralInfo, fromEmulator, client, newInfo);
504
504
  await (0, io_2.updateExistingJson)(root, constants_1.packageJson, pkg);
505
505
  (0, log_1.log)('generalDebug_0003', `Succesfully patched the ${constants_1.packageJson}.`);
506
506
  }
507
507
  function isWebsiteCompatible(version) {
508
508
  return (0, version_1.satisfies)(version, '>=1.4.0');
509
509
  }
510
- async function getPiletPackage(root, piralInfo, fromEmulator, newInfo) {
510
+ async function getExistingDependencies(client) {
511
+ if (client.monorepo) {
512
+ const existingData = await (0, io_2.readJson)(client.monorepo, constants_1.packageJson);
513
+ return [
514
+ ...Object.keys(existingData.devDependencies || {}),
515
+ ...Object.keys(existingData.dependencies || {}),
516
+ ];
517
+ }
518
+ return [];
519
+ }
520
+ async function getPiletPackage(root, piralInfo, fromEmulator, client, newInfo) {
511
521
  const { piralCLI = { version: info_1.cliVersion } } = piralInfo;
512
522
  const { packageOverrides, ...info } = getPiletsInfo(piralInfo);
513
523
  const existingData = newInfo ? {} : await (0, io_2.readJson)(root, constants_1.packageJson);
524
+ const existingDependencies = await getExistingDependencies(client);
514
525
  const piralDependencies = {
515
526
  ...piralInfo.devDependencies,
516
527
  ...piralInfo.dependencies,
@@ -552,6 +563,10 @@ async function getPiletPackage(root, piralInfo, fromEmulator, newInfo) {
552
563
  if (newInfo) {
553
564
  await appendBundler(devDependencies, newInfo.bundler, toolVersion);
554
565
  }
566
+ for (const name of existingDependencies) {
567
+ delete devDependencies[name];
568
+ delete dependencies[name];
569
+ }
555
570
  return (0, merge_1.deepMerge)(packageOverrides, {
556
571
  importmap: {
557
572
  imports: {},
package/lib/common/package.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"package.js","sourceRoot":"","sources":["../../src/common/package.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "piral-cli",
3
- "version": "1.8.3-beta.7916",
3
+ "version": "1.8.3-beta.7922",
4
4
  "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
5
5
  "keywords": [
6
6
  "portal",
@@ -78,5 +78,5 @@
78
78
  "open": "^10",
79
79
  "typescript": "^5"
80
80
  },
81
- "gitHead": "43f9a1f40e3e6d2de09de5c40b9ab2424ddbc818"
81
+ "gitHead": "0213e40c854e4c246048c7770b8074dcbf154009"
82
82
  }
package/src/apps/new-pilet.ts CHANGED
@@ -229,7 +229,7 @@ always-auth=true`,
229
229
 
230
230
  const data = getPiletScaffoldData(language, root, packageName, variables);
231
231
 
232
- await patchPiletPackage(root, piralInfo, isEmulator, {
232
+ await patchPiletPackage(root, piralInfo, isEmulator, npmClient, {
233
233
  language,
234
234
  bundler: bundlerName,
235
235
  });
package/src/apps/upgrade-pilet.ts CHANGED
@@ -186,7 +186,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
186
186
  await copyScaffoldingFiles(packageRoot, root, notOnceFiles, piralInfo, data);
187
187
  }
188
188
 
189
- await patchPiletPackage(root, piralInfo, isEmulator);
189
+ await patchPiletPackage(root, piralInfo, isEmulator, npmClient);
190
190
 
191
191
  if (install) {
192
192
  progress(`Updating dependencies ...`);
package/src/common/package.ts CHANGED
@@ -19,7 +19,7 @@ import { piralJsonSchemaUrl, filesTar, filesOnceTar, bundlerNames, packageJson }
19
19
  import { frameworkLibs, declarationEntryExtensions, piralJson, piletJson } from './constants';
20
20
  import { satisfies } from './version';
21
21
  import { getModulePath } from '../external';
22
- import { PiletsInfo, SharedDependency, PiletDefinition, AppDefinition } from '../types';
22
+ import { PiletsInfo, SharedDependency, PiletDefinition, AppDefinition, NpmClient } from '../types';
23
23
  import { SourceLanguage, PiralInstancePackageData, PiralInstanceDetails } from '../types';
24
24
  import { Framework, FileInfo, TemplateFileLocation, PiletPackageData, PiralPackageData } from '../types';
25
25
 
@@ -649,10 +649,11 @@ export async function patchPiletPackage(
649
649
  root: string,
650
650
  piralInfo: PiralPackageData,
651
651
  fromEmulator: boolean,
652
+ client: NpmClient,
652
653
  newInfo?: { language: SourceLanguage; bundler: string },
653
654
  ) {
654
655
  log('generalDebug_0003', `Patching the ${packageJson} in "${root}" ...`);
655
- const pkg = await getPiletPackage(root, piralInfo, fromEmulator, newInfo);
656
+ const pkg = await getPiletPackage(root, piralInfo, fromEmulator, client, newInfo);
656
657
  await updateExistingJson(root, packageJson, pkg);
657
658
  log('generalDebug_0003', `Succesfully patched the ${packageJson}.`);
658
659
  }
@@ -661,15 +662,29 @@ function isWebsiteCompatible(version: string) {
661
662
  return satisfies(version, '>=1.4.0');
662
663
  }
663
664
 
665
+ async function getExistingDependencies(client: NpmClient): Promise<Array<string>> {
666
+ if (client.monorepo) {
667
+ const existingData = await readJson(client.monorepo, packageJson);
668
+ return [
669
+ ...Object.keys(existingData.devDependencies || {}),
670
+ ...Object.keys(existingData.dependencies || {}),
671
+ ];
672
+ }
673
+
674
+ return [];
675
+ }
676
+
664
677
  async function getPiletPackage(
665
678
  root: string,
666
679
  piralInfo: PiralPackageData,
667
680
  fromEmulator: boolean,
681
+ client: NpmClient,
668
682
  newInfo?: { language: SourceLanguage; bundler: string },
669
683
  ) {
670
684
  const { piralCLI = { version: cliVersion } } = piralInfo;
671
685
  const { packageOverrides, ...info } = getPiletsInfo(piralInfo);
672
686
  const existingData = newInfo ? {} : await readJson(root, packageJson);
687
+ const existingDependencies = await getExistingDependencies(client)
673
688
  const piralDependencies = {
674
689
  ...piralInfo.devDependencies,
675
690
  ...piralInfo.dependencies,
@@ -715,6 +730,11 @@ async function getPiletPackage(
715
730
  await appendBundler(devDependencies, newInfo.bundler, toolVersion);
716
731
  }
717
732
 
733
+ for (const name of existingDependencies) {
734
+ delete devDependencies[name];
735
+ delete dependencies[name];
736
+ }
737
+
718
738
  return deepMerge(packageOverrides, {
719
739
  importmap: {
720
740
  imports: {},