piral-cli 0.14.0-beta.3184 → 0.14.0-beta.3216

package/lib/common/template.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/common/template.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAAiC;AACjC,+BAA+B;AAC/B,+BAA4B;AAE5B,6BAA6C;AAE7C,SAAgB,YAAY,CAAC,IAAY,EAAE,OAAY,EAAE;IACvD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;IACxE,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAA,SAAG,EAAC,mBAAmB,EAAE,mCAAmC,IAAI,IAAI,CAAC,CAAC;QACtE,IAAA,gBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAClC,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,oCAYC;AAED,SAAsB,iCAAiC,CACrD,MAAc,EACd,SAAiB,EACjB,QAAgB,EAChB,cAA+B,EAC/B,IAAU;;QAEV,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,GAAG,MAAM,IAAI,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,IAAA,0BAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC5E,CAAC;CAAA;AATD,8EASC"}
+{"version":3,"file":"template.js","sourceRoot":"","sources":["../../src/common/template.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAAiC;AACjC,2BAA+B;AAC/B,+BAA+B;AAC/B,+BAA4B;AAE5B,6BAA6C;AAE7C,SAAsB,aAAa,CAAC,IAAY,EAAE,IAA4B;;QAC5E,MAAM,OAAO,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC5D,IAAA,SAAG,EAAC,mBAAmB,EAAE,wBAAwB,IAAI,IAAI,CAAC,CAAC;YAC3D,IAAA,gBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAClC,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,OAAO,CAAC,GAAG,CAAC,CAAC;iBACd;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,IAAA,cAAS,EAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE;gBACvC,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,OAAO,EAAE,CAAC;iBACX;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AApBD,sCAoBC;AAED,SAAgB,YAAY,CAAC,IAAY,EAAE,OAAY,EAAE;IACvD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAI,MAAM,CAAC,CAAC;IACxE,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC7C,IAAA,SAAG,EAAC,mBAAmB,EAAE,uBAAuB,IAAI,SAAS,IAAI,IAAI,CAAC,CAAC;QACvE,IAAA,gBAAU,EAAC,IAAI,EAAE,IAAI,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAClC,IAAI,GAAG,EAAE;gBACP,MAAM,CAAC,GAAG,CAAC,CAAC;aACb;iBAAM;gBACL,OAAO,CAAC,GAAG,CAAC,CAAC;aACd;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAZD,oCAYC;AAED,SAAsB,iCAAiC,CACrD,MAAc,EACd,SAAiB,EACjB,QAAgB,EAChB,cAA+B,EAC/B,IAAU;;QAEV,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,GAAG,MAAM,IAAI,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QAClE,MAAM,IAAA,0BAAqB,EAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAC5E,CAAC;CAAA;AATD,8EASC"}

package/lib/types/common.d.ts

@@ -44,6 +44,7 @@ export interface ReleaseProvider {
 export interface TemplateFileLocation {
     from: string;
     to: string;
+    template?: boolean;
     deep?: boolean;
     once?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "0.14.0-beta.3184",
+  "version": "0.14.0-beta.3216",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -77,5 +77,5 @@
     "typescript": "^4.0.2",
     "yargs": "^15.4.1"
   },
-  "gitHead": "2d00bfdcdf47c737ffb8d58f700945362ab9ac6d"
+  "gitHead": "4ae646f90377893373f4ebc575eb0b8a707f8b94"
 }

package/src/apps/build-pilet.ts

@@ -83,6 +83,18 @@ export interface BuildPiletOptions {
    * Additional arguments for a specific bundler.
    */
   _?: Record<string, any>;
+
+  /**
+   * Hooks to be triggered at various stages.
+   */
+  hooks?: {
+    onBegin?(e: any): Promise<void>;
+    beforeBuild?(e: any): Promise<void>;
+    afterBuild?(e: any): Promise<void>;
+    beforeDeclaration?(e: any): Promise<void>;
+    afterDeclaration?(e: any): Promise<void>;
+    onEnd?(e: any): Promise<void>;
+  };
 }
 
 export const buildPiletDefaults: BuildPiletOptions = {
@@ -111,11 +123,14 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
     schemaVersion = buildPiletDefaults.schemaVersion,
     declaration = buildPiletDefaults.declaration,
     _ = {},
+    hooks = {},
     bundlerName,
     app,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   setLogLevel(logLevel);
+
+  await hooks.onBegin?.({ options, fullBase });
   progress('Reading configuration ...');
   const allEntries = await matchAnyPilet(fullBase, [entry]);
 
@@ -139,6 +154,8 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
 
   logInfo('Bundle pilet ...');
 
+  await hooks.beforeBuild?.({ root, outDir, importmap, entryModule, schemaVersion, piletPackage });
+
   await callPiletBuild(
     {
       root,
@@ -161,9 +178,14 @@ export async function buildPilet(baseDir = process.cwd(), options: BuildPiletOpt
     bundlerName,
   );
 
+  await hooks.afterBuild?.({ root, outDir, importmap, entryModule, schemaVersion, piletPackage });
+
   if (declaration) {
+    await hooks.beforeDeclaration?.({ root, outDir, entryModule, piletPackage });
     await createPiletDeclaration(piletPackage.name, root, entryModule, externals, outDir, ForceOverwrite.yes, logLevel);
+    await hooks.afterDeclaration?.({ root, outDir, entryModule, piletPackage });
   }
 
   logDone('Pilet built successfully!');
+  await hooks.onEnd?.({ root });
 }

package/src/apps/build-piral.ts

@@ -107,6 +107,20 @@ export interface BuildPiralOptions {
    * Additional arguments for a specific bundler.
    */
   _?: Record<string, any>;
+
+  /**
+   * Hooks to be triggered at various stages.
+   */
+  hooks?: {
+    onBegin?(e: any): Promise<void>;
+    beforeBuild?(e: any): Promise<void>;
+    afterBuild?(e: any): Promise<void>;
+    beforeEmulator?(e: any): Promise<void>;
+    afterEmulator?(e: any): Promise<void>;
+    beforePackage?(e: any): Promise<void>;
+    afterPackage?(e: any): Promise<void>;
+    onEnd?(e: any): Promise<void>;
+  };
 }
 
 export const buildPiralDefaults: BuildPiralOptions = {
@@ -149,11 +163,14 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
     type = buildPiralDefaults.type,
     optimizeModules = buildPiralDefaults.optimizeModules,
     _ = {},
+    hooks = {},
     bundlerName,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   const useSubdir = type === 'all' || subdir;
   setLogLevel(logLevel);
+
+  await hooks.onBegin?.({ options, fullBase });
   progress('Reading configuration ...');
   const entryFiles = await retrievePiralRoot(fullBase, entry);
   const { name, root, ignored, externals, scripts } = await retrievePiletsInfo(entryFiles);
@@ -174,8 +191,10 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
     // since we create this anyway let's just pretend we want to have it clean!
     await removeDirectory(targetDir);
 
+    await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, targetDir, name });
+
     logInfo(`Bundle ${emulatorName} ...`);
-    const { dir: outDir, name: outFile } = await callPiralBuild(
+    const { dir: outDir, name: outFile, hash } = await callPiralBuild(
       {
         root,
         piral: name,
@@ -196,13 +215,21 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
       bundlerName,
     );
 
+    await hooks.afterBuild?.({ root, publicUrl, externals, entryFiles, targetDir, name, outDir, hash, outFile });
+
     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) {
+      await hooks.beforePackage?.({ root, externals, targetDir, outDir, rootDir });
       await packageEmulator(rootDir);
+      await hooks.afterPackage?.({ root, externals, targetDir, outDir, rootDir });
       logDone(`Emulator package available in "${rootDir}".`);
     } else {
       logDone(`Emulator sources available in "${rootDir}".`);
@@ -220,7 +247,10 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
     await removeDirectory(targetDir);
 
     logInfo(`Bundle ${releaseName} ...`);
-    const { dir: outDir } = await callPiralBuild(
+    
+    await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, targetDir, name });
+
+    const { dir: outDir, name: outFile, hash } = await callPiralBuild(
       {
         root,
         piral: name,
@@ -240,6 +270,8 @@ 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');
     await runLifecycle(root, scripts, `piral:postbuild-${releaseName}`);
@@ -247,4 +279,6 @@ export async function buildPiral(baseDir = process.cwd(), options: BuildPiralOpt
     logDone(`Files for publication available in "${outDir}".`);
     logReset();
   }
+
+  await hooks.onEnd?.({ root });
 }

package/src/apps/debug-pilet.ts

@@ -73,6 +73,18 @@ export interface DebugPiletOptions {
    * Additional arguments for a specific bundler.
    */
   _?: Record<string, any>;
+
+  /**
+   * Hooks to be triggered at various stages.
+   */
+  hooks?: {
+    onBegin?(e: any): Promise<void>;
+    beforeBuild?(e: any): Promise<void>;
+    afterBuild?(e: any): Promise<void>;
+    beforeOnline?(e: any): Promise<void>;
+    afterOnline?(e: any): Promise<void>;
+    onEnd?(e: any): Promise<void>;
+  };
 }
 
 export const debugPiletDefaults: DebugPiletOptions = {
@@ -142,19 +154,23 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
     optimizeModules = debugPiletDefaults.optimizeModules,
     schemaVersion = debugPiletDefaults.schemaVersion,
     _ = {},
+    hooks = {},
     bundlerName,
     app,
     feed,
   } = options;
+  const fullBase = resolve(process.cwd(), baseDir);
   setLogLevel(logLevel);
+
+  await hooks.onBegin?.({ options, fullBase });
   progress('Reading configuration ...');
   const krasConfig = readKrasConfig({ port }, krasrc);
   const api = config.piletApi;
   const entryList = Array.isArray(entry) ? entry : [entry];
   const multi = entryList.length > 1 || entryList[0].indexOf('*') !== -1;
-  log('generalDebug_0003', `Looking for (${multi ? 'multi' : 'single'}) "${entryList.join('", "')}" in "${baseDir}".`);
+  log('generalDebug_0003', `Looking for (${multi ? 'multi' : 'single'}) "${entryList.join('", "')}" in "${fullBase}".`);
 
-  const allEntries = await matchAnyPilet(baseDir, entryList);
+  const allEntries = await matchAnyPilet(fullBase, entryList);
   log('generalDebug_0003', `Found the following entries: ${allEntries.join(', ')}`);
 
   if (krasConfig.sources === undefined) {
@@ -168,10 +184,8 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
   const pilets = await Promise.all(
     allEntries.map(async (entryModule) => {
       const targetDir = dirname(entryModule);
-      const { peerDependencies, peerModules, root, appPackage, appFile, ignored, emulator, importmap } = await retrievePiletData(
-        targetDir,
-        app,
-      );
+      const { peerDependencies, peerModules, root, appPackage, appFile, ignored, emulator, importmap } =
+        await retrievePiletData(targetDir, app);
       const externals = [...Object.keys(peerDependencies), ...peerModules];
       const mocks = join(targetDir, 'mocks');
       const exists = await checkExistingDirectory(mocks);
@@ -184,6 +198,8 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
         krasConfig.sources.push(mocks);
       }
 
+      await hooks.beforeBuild?.({ root, importmap, entryModule, schemaVersion });
+
       const bundler = await callPiletDebug(
         {
           root,
@@ -202,6 +218,8 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
         bundlerName,
       );
 
+      await hooks.afterBuild?.({ root, importmap, entryModule, schemaVersion, bundler });
+
       return {
         emulator,
         appFile,
@@ -260,7 +278,10 @@ export async function debugPilet(baseDir = process.cwd(), options: DebugPiletOpt
     ),
   );
 
+  await hooks.beforeOnline?.({ krasServer, krasConfig, open, port, api, feed, pilets });
   await krasServer.start();
   openBrowser(open, port);
+  await hooks.afterOnline?.({ krasServer, krasConfig, open, port, api, feed, pilets });
   await new Promise((resolve) => krasServer.on('close', resolve));
+  await hooks.onEnd?.({});
 }

package/src/apps/debug-piral.ts

@@ -60,6 +60,18 @@ export interface DebugPiralOptions {
    * Additional arguments for a specific bundler.
    */
   _?: Record<string, any>;
+
+  /**
+   * Hooks to be triggered at various stages.
+   */
+  hooks?: {
+    onBegin?(e: any): Promise<void>;
+    beforeBuild?(e: any): Promise<void>;
+    afterBuild?(e: any): Promise<void>;
+    beforeOnline?(e: any): Promise<void>;
+    afterOnline?(e: any): Promise<void>;
+    onEnd?(e: any): Promise<void>;
+  };
 }
 
 export const debugPiralDefaults: DebugPiralOptions = {
@@ -84,10 +96,13 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
     logLevel = debugPiralDefaults.logLevel,
     optimizeModules = debugPiralDefaults.optimizeModules,
     _ = {},
+    hooks = {},
     bundlerName,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   setLogLevel(logLevel);
+
+  await hooks.onBegin?.({ options, fullBase });
   progress('Reading configuration ...');
   const entryFiles = await retrievePiralRoot(fullBase, entry);
   const { externals, name, root, ignored } = await retrievePiletsInfo(entryFiles);
@@ -115,6 +130,8 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
     krasConfig.injectors = defaultConfig.injectors;
   }
 
+  await hooks.beforeBuild?.({ root, publicUrl, externals, entryFiles, name });
+
   const bundler = await callPiralDebug(
     {
       root,
@@ -130,6 +147,7 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
     },
     bundlerName,
   );
+  await hooks.afterBuild?.({ root, publicUrl, externals, entryFiles, name, bundler });
 
   const injectorConfig = {
     active: true,
@@ -146,7 +164,10 @@ export async function debugPiral(baseDir = process.cwd(), options: DebugPiralOpt
   krasServer.removeAllListeners('open');
   krasServer.on('open', notifyServerOnline([bundler], krasConfig.api));
 
+  await hooks.beforeOnline?.({ krasServer, krasConfig, open, port });
   await krasServer.start();
   openBrowser(open, port);
+  await hooks.afterOnline?.({ krasServer, krasConfig, open, port });
   await new Promise((resolve) => krasServer.on('close', resolve));
+  await hooks.onEnd?.({});
 }

package/src/apps/new-pilet.ts

@@ -30,6 +30,7 @@ import {
   getPiralPath,
   detectMonorepo,
   bootstrapMonorepo,
+  getPiletScaffoldData,
 } from '../common';
 
 export interface NewPiletOptions {
@@ -193,16 +194,17 @@ always-auth=true`,
 
     progress(`Taking care of templating ...`);
 
-    await scaffoldPiletSourceFiles(template, registry, language, root, packageName, forceOverwrite, variables);
+    const data = getPiletScaffoldData(language, root, packageName, variables);
+    await scaffoldPiletSourceFiles(template, registry, data, forceOverwrite);
 
     if (isEmulator) {
       // in the emulator case we get the files (and files_once) from the contained tarballs
-      await copyPiralFiles(root, packageName, piralInfo, ForceOverwrite.yes);
+      await copyPiralFiles(root, packageName, piralInfo, ForceOverwrite.yes, data);
     } else {
       // otherwise, we perform the same action as in the emulator creation
       // just with a different target; not a created directory, but the root
       const packageRoot = getPiralPath(root, packageName);
-      await copyScaffoldingFiles(packageRoot, root, files, piralInfo);
+      await copyScaffoldingFiles(packageRoot, root, files, piralInfo, data);
     }
 
     await patchPiletPackage(root, packageName, packageVersion, piralInfo, isEmulator, {

package/src/apps/new-piral.ts

@@ -18,6 +18,7 @@ import {
   determineNpmClient,
   defaultRegistry,
   cliVersion,
+  getPiralScaffoldData,
 } from '../common';
 
 export interface NewPiralOptions {
@@ -166,8 +167,9 @@ always-auth=true`,
     await installPackage(npmClient, packageRef, root);
 
     progress(`Taking care of templating ...`);
-
-    await scaffoldPiralSourceFiles(template, registry, language, root, app, framework, forceOverwrite, variables);
+    
+    const data = getPiralScaffoldData(language, root, app, framework, variables);
+    await scaffoldPiralSourceFiles(template, registry, data, forceOverwrite);
 
     if (install) {
       progress(`Installing dependencies ...`);

package/src/apps/upgrade-pilet.ts

@@ -25,6 +25,8 @@ import {
   detectMonorepo,
   bootstrapMonorepo,
   isMonorepoPackageRef,
+  getPiletScaffoldData,
+  SourceLanguage,
 } from '../common';
 
 export interface UpgradePiletOptions {
@@ -63,6 +65,11 @@ export interface UpgradePiletOptions {
    * works against Lerna, pnpm, and Yarn.
    */
   npmClient?: NpmClientType;
+
+  /**
+   * Places additional variables that should used when scaffolding.
+   */
+  variables?: Record<string, string>;
 }
 
 export const upgradePiletDefaults: UpgradePiletOptions = {
@@ -72,6 +79,7 @@ export const upgradePiletDefaults: UpgradePiletOptions = {
   logLevel: LogLevels.info,
   install: true,
   npmClient: undefined,
+  variables: {},
 };
 
 export async function upgradePilet(baseDir = process.cwd(), options: UpgradePiletOptions = {}) {
@@ -81,6 +89,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
     forceOverwrite = upgradePiletDefaults.forceOverwrite,
     logLevel = upgradePiletDefaults.logLevel,
     install = upgradePiletDefaults.install,
+    variables = upgradePiletDefaults.variables,
   } = options;
   const fullBase = resolve(process.cwd(), baseDir);
   const root = resolve(fullBase, target);
@@ -93,10 +102,11 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
 
   const npmClient = await determineNpmClient(root, options.npmClient);
   const pckg = await readJson(root, 'package.json');
-  const { devDependencies = {}, dependencies = {}, piral } = pckg;
+  const { devDependencies = {}, dependencies = {}, piral, source } = pckg;
 
   if (piral && typeof piral === 'object') {
     const sourceName = piral.name;
+    const language = /\.jsx?$/.test(source) ? SourceLanguage.js : SourceLanguage.ts;
 
     if (!sourceName || typeof sourceName !== 'string') {
       fail('invalidPiletPackage_0042');
@@ -137,16 +147,17 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
     }
 
     progress(`Taking care of templating ...`);
+    const data = getPiletScaffoldData(language, root, sourceName, variables);
 
     if (isEmulator) {
       // in the emulator case we get the files from the contained tarball
-      await copyPiralFiles(root, sourceName, piralInfo, forceOverwrite, originalFiles);
+      await copyPiralFiles(root, sourceName, piralInfo, forceOverwrite, data, originalFiles);
     } else {
       // otherwise, we perform the same action as in the emulator creation
       // just with a different target; not a created directory, but the root
       const packageRoot = getPiralPath(root, sourceName);
       const notOnceFiles = files.filter((m) => typeof m === 'string' || !m.once);
-      await copyScaffoldingFiles(packageRoot, root, notOnceFiles, piralInfo);
+      await copyScaffoldingFiles(packageRoot, root, notOnceFiles, piralInfo, data);
     }
 
     await patchPiletPackage(root, sourceName, packageVersion, piralInfo, isEmulator);

package/src/commands.ts

@@ -682,6 +682,9 @@ const allCommands: Array<ToolCommand<any>> = [
         .choices('npm-client', clientTypeKeys)
         .describe('npm-client', 'Sets the npm client to be used when upgrading.')
         .default('npm-client', apps.upgradePiletDefaults.npmClient)
+        .option('vars', undefined)
+        .describe('vars', 'Sets additional variables to be used when scaffolding.')
+        .default('vars', apps.upgradePiletDefaults.variables)
         .string('base')
         .default('base', process.cwd())
         .describe('base', 'Sets the base directory. By default the current directory is used.');
@@ -694,6 +697,7 @@ const allCommands: Array<ToolCommand<any>> = [
         forceOverwrite: valueOfForceOverwrite(args['force-overwrite'] as string),
         install: args.install as boolean,
         npmClient: args['npm-client'] as NpmClientType,
+        variables: args.vars as Record<string, string>,
       });
     },
   },

package/src/common/emulator.ts

@@ -46,11 +46,13 @@ export async function createEmulatorSources(
   const filesOnceDir = resolve(rootDir, filesOnceTar);
 
   const filesMap = files
+    .filter((file) => file && (typeof file === 'string' || typeof file === 'object'))
     .map((file) => (typeof file === 'string' ? { from: file, to: file } : file))
+    .filter((file) => typeof file.to === 'string' && typeof file.from === 'string')
     .map((file) => ({
       ...file,
       to: file.to.replace(/\\/g, '/'),
-      from: join('files', file.from).replace(/\\/g, '/'),
+      from: join('files', file.to).replace(/\\/g, '/'),
     }));
 
   // do not modify an existing JSON

package/src/common/log.ts

@@ -11,10 +11,15 @@ type MessageTypes = keyof Messages;
 
 const logger = (() => {
   try {
-    return require('@parcel/logger');
-  } catch {
-    return require('../external').logger;
-  }
+    const logger = require('@parcel/logger');
+
+    // check to see if this is really right
+    if (typeof logger.verbose === 'function') {
+      return logger;
+    }
+  } catch {}
+
+  return require('../external').logger;
 })();
 
 // unfortunately, Parcel's support for verbose logging on Windows is broken