piral-cli 0.14.27-beta.4290 → 0.14.28-beta.4363

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "0.14.27-beta.4290",
+  "version": "0.14.28-beta.4363",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -79,5 +79,5 @@
     "typescript": "^4.0.2",
     "yargs": "^15.4.1"
   },
-  "gitHead": "82fec640a46c17aa9ae03dcf2c8ac3895bbabfcb"
+  "gitHead": "d9425ff60676c2a1ae73f1d5c13527c58242badd"
 }

package/src/commands.ts

@@ -271,9 +271,11 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('install')
         .describe('install', 'Already performs the installation of its npm dependencies.')
         .default('install', apps.newPiralDefaults.install)
+        .alias('install', 'package-install')
         .string('registry')
         .describe('registry', 'Sets the package registry to use for resolving the dependencies.')
         .default('registry', apps.newPiralDefaults.registry)
+        .alias('registry', 'package-registry')
         .number('log-level')
         .describe('log-level', 'Sets the log level to use (1-5).')
         .default('log-level', apps.newPiralDefaults.logLevel)
@@ -283,6 +285,7 @@ const allCommands: Array<ToolCommand<any>> = [
           'Sets the tag or version of the package to install. By default, this uses the version of the CLI.',
         )
         .default('tag', apps.newPiralDefaults.version)
+        .alias('tag', 'piral-version')
         .choices('force-overwrite', forceOverwriteKeys)
         .describe('force-overwrite', 'Determines if files should be overwritten by the installation.')
         .default('force-overwrite', keyOfForceOverwrite(apps.newPiralDefaults.forceOverwrite))
@@ -344,6 +347,7 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('install')
         .describe('install', 'Already performs the update of its npm dependencies.')
         .default('install', apps.upgradePiralDefaults.install)
+        .alias('install', 'package-install')
         .choices('npm-client', clientTypeKeys)
         .describe('npm-client', 'Sets the npm client to be used when upgrading.')
         .default('npm-client', apps.upgradePiralDefaults.npmClient)
@@ -604,6 +608,7 @@ const allCommands: Array<ToolCommand<any>> = [
         .choices('mode', publishModeKeys)
         .describe('mode', 'Sets the authorization mode to use.')
         .default('mode', apps.publishPiletDefaults.mode)
+        .alias('mode', 'auth-mode')
         .choices('bundler', availableBundlers)
         .describe('bundler', 'Sets the bundler to use.')
         .default('bundler', availableBundlers[0])
@@ -658,9 +663,11 @@ const allCommands: Array<ToolCommand<any>> = [
         .string('registry')
         .describe('registry', 'Sets the package registry to use for resolving the specified Piral app.')
         .default('registry', apps.newPiletDefaults.registry)
+        .alias('registry', 'package-registry')
         .boolean('install')
         .describe('install', 'Already performs the installation of its npm dependencies.')
         .default('install', apps.newPiletDefaults.install)
+        .alias('install', 'package-install')
         .choices('force-overwrite', forceOverwriteKeys)
         .describe('force-overwrite', 'Determines if files should be overwritten by the scaffolding.')
         .default('force-overwrite', keyOfForceOverwrite(apps.newPiletDefaults.forceOverwrite))
@@ -723,6 +730,7 @@ const allCommands: Array<ToolCommand<any>> = [
         .boolean('install')
         .describe('install', 'Already performs the update of its npm dependencies.')
         .default('install', apps.upgradePiletDefaults.install)
+        .alias('install', 'package-install')
         .choices('force-overwrite', forceOverwriteKeys)
         .describe('force-overwrite', 'Determines if files should be overwritten by the upgrading process.')
         .default('force-overwrite', keyOfForceOverwrite(apps.upgradePiletDefaults.forceOverwrite))

package/src/common/npm.ts

@@ -3,7 +3,7 @@ import { createReadStream, existsSync } from 'fs';
 import { log, fail } from './log';
 import { clients, detectClients, isWrapperClient } from './clients';
 import { config } from './config';
-import { legacyCoreExternals, frameworkLibs } from './constants';
+import { legacyCoreExternals, frameworkLibs, defaultRegistry } from './constants';
 import { inspectPackage } from './inspect';
 import { readJson, checkExists } from './io';
 import { clientTypeKeys } from '../helpers';
@@ -125,6 +125,22 @@ export function installNpmDependencies(client: NpmClientType, target = '.'): Pro
   return installDependencies(target);
 }
 
+export async function installNpmPackageFromOptionalRegistry(
+  packageRef: string,
+  target = '.',
+  registry: string,
+): Promise<void> {
+  try {
+    await installNpmPackage('npm', packageRef, target, '--registry', registry);
+  } catch (e) {
+    if (registry === defaultRegistry) {
+      throw e;
+    }
+
+    await installNpmPackage('npm', packageRef, target, '--registry', defaultRegistry);
+  }
+}
+
 export async function installNpmPackage(
   client: NpmClientType,
   packageRef: string,

package/src/common/scaffold.ts

@@ -1,5 +1,5 @@
 import { join, dirname, resolve, basename, isAbsolute } from 'path';
-import { installNpmPackage } from './npm';
+import { installNpmPackageFromOptionalRegistry } from './npm';
 import { ForceOverwrite, SourceLanguage } from './enums';
 import { createDirectory, createFileIfNotExists, updateExistingJson } from './io';
 import { log, fail } from './log';
@@ -40,7 +40,7 @@ async function getTemplateFiles(
       templatePackageName = `${templatePackageName}@latest`;
     }
 
-    await installNpmPackage('npm', templatePackageName, __dirname, '--registry', registry);
+    await installNpmPackageFromOptionalRegistry(templatePackageName, __dirname, registry);
   }
 
   const templateRunner = getTemplatePackage(templatePackageName);