@form8ion/javascript 5.9.0 → 6.0.0-alpha.2

package/lib/index.es.js

@@ -1,12 +1,12 @@
 import { questionNames as questionNames$2, questions } from '@travi/language-scaffolder-prompts';
 import deepmerge from 'deepmerge';
-import { validateOptions, scaffoldChoice, dialects, projectTypes, installDependencies, PROD_DEPENDENCY_TYPE, DEV_DEPENDENCY_TYPE, packageManagers } from '@form8ion/javascript-core';
+import { validateOptions, scaffoldChoice, dialects, projectTypes, writePackageJson, installDependencies, PROD_DEPENDENCY_TYPE, DEV_DEPENDENCY_TYPE, packageManagers, mergeIntoExistingPackageJson } from '@form8ion/javascript-core';
 import * as joi from 'joi';
 import { Separator } from 'inquirer';
 import { prompt as prompt$1 } from '@form8ion/overridable-prompts';
 import { scaffold, lift as lift$3 } from '@form8ion/codecov';
 import { promises } from 'fs';
-import { fileExists, writeConfigFile, fileTypes, applyEnhancers } from '@form8ion/core';
+import { fileExists, applyEnhancers, fileTypes } from '@form8ion/core';
 import { info, error, warn } from '@travi/cli-messages';
 import * as commitConventionPlugin from '@form8ion/commit-convention';
 import { scaffold as scaffold$4 } from '@form8ion/commit-convention';
@@ -24,7 +24,7 @@ import { resolve } from 'path';
 import * as huskyPlugin from '@form8ion/husky';
 import { scaffold as scaffold$3 } from '@form8ion/husky';
 import { lift as lift$4, scaffold as scaffold$2 } from '@form8ion/eslint';
-import { write as write$1 } from '@form8ion/config-file';
+import { write } from '@form8ion/config-file';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -137,7 +137,7 @@ async function removeNyc ({
   projectRoot,
   packageManager
 }) {
-  await Promise.all([promises.unlink(`${projectRoot}/.nycrc`), promises.rmdir(`${projectRoot}/.nyc_output`, {
+  await Promise.all([promises.unlink(`${projectRoot}/.nycrc`), promises.rm(`${projectRoot}/.nyc_output`, {
     recursive: true,
     force: true
   }), removeDependencies({
@@ -284,18 +284,6 @@ var enginesEnhancer = /*#__PURE__*/Object.freeze({
   lift: lift$1
 });
 
-function write({
-  projectRoot,
-  config
-}) {
-  return writeConfigFile({
-    format: fileTypes.JSON,
-    name: 'package',
-    path: projectRoot,
-    config
-  });
-}
-
 function scaffoldScripts () {
   return {};
 }
@@ -341,15 +329,14 @@ function buildPackageDetails ({
   vcs,
   author,
   description,
-  packageProperties,
   pathWithinParent
 }) {
-  return _objectSpread2(_objectSpread2(_objectSpread2({
+  return _objectSpread2(_objectSpread2({
     name: packageName,
     description,
     license,
     type: dialects.ESM === dialect ? 'module' : 'commonjs'
-  }, packageProperties), defineVcsHostDetails(vcs, projectType, packageName, pathWithinParent)), {}, {
+  }, defineVcsHostDetails(vcs, projectType, packageName, pathWithinParent)), {}, {
     author: `${author.name}${author.email ? ` <${author.email}>` : ''}${author.url ? ` (${author.url})` : ''}`,
     scripts: scaffoldScripts()
   });
@@ -364,7 +351,6 @@ async function scaffoldPackage ({
   vcs,
   author,
   description,
-  packageProperties,
   pathWithinParent
 }) {
   info('Configuring package.json');
@@ -376,10 +362,9 @@ async function scaffoldPackage ({
     vcs,
     author,
     description,
-    packageProperties,
     pathWithinParent
   });
-  await write({
+  await writePackageJson({
     projectRoot,
     config: packageData
   });
@@ -402,7 +387,7 @@ async function liftPackage ({
     });
     const pathToPackageJson = `${projectRoot}/package.json`;
     const existingPackageJsonContents = JSON.parse(await promises.readFile(pathToPackageJson, 'utf8'));
-    await write({
+    await writePackageJson({
       projectRoot,
       config: _objectSpread2(_objectSpread2({}, existingPackageJsonContents), {}, {
         scripts: liftScripts({
@@ -774,7 +759,7 @@ async function scaffoldBabel ({
     throw new Error('No babel preset provided. Cannot configure babel transpilation');
   }
 
-  await write$1({
+  await write({
     path: projectRoot,
     name: 'babel',
     format: fileTypes.JSON,
@@ -822,16 +807,6 @@ async function scaffoldTypescript ({
   };
 }
 
-function scaffoldEsm () {
-  return {
-    packageProperties: {
-      engines: {
-        node: '>=12.20'
-      }
-    }
-  };
-}
-
 function scaffoldDialect ({
   dialect,
   projectType,
@@ -856,13 +831,8 @@ function scaffoldDialect ({
         testFilenamePattern
       });
 
-    case dialects.ESM:
-      return scaffoldEsm();
-
     default:
-      return {
-        eslint: {}
-      };
+      return {};
   }
 }
 
@@ -1129,7 +1099,7 @@ async function scaffoldPackageType ({
   publishRegistry
 }) {
   info('Scaffolding Package Details');
-  const detailsForBuild = await buildDetails({
+  const [detailsForBuild] = await Promise.all([buildDetails({
     projectRoot,
     projectName,
     packageBundlers,
@@ -1137,28 +1107,29 @@ async function scaffoldPackageType ({
     packageName,
     dialect,
     decisions
-  });
-
-  const details = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, dialects.BABEL === dialect && _objectSpread2({
-    packageProperties: {
+  }), mergeIntoExistingPackageJson({
+    projectRoot,
+    config: _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({
+      files: ['example.js', ...(dialects.COMMON_JS === dialect ? ['index.js'] : ['lib/'])],
+      publishConfig: _objectSpread2({
+        access: 'Public' === visibility ? 'public' : 'restricted'
+      }, publishRegistry && {
+        registry: publishRegistry
+      }),
+      sideEffects: false
+    }, 'Public' === visibility && {
+      runkitExampleFilename: './example.js'
+    }), dialects.BABEL === dialect && {
       main: './lib/index.cjs.js',
       module: './lib/index.es.js',
       exports: {
         require: './lib/index.cjs.js',
         import: './lib/index.es.js'
-      },
-      sideEffects: false,
-      files: ['lib/']
-    }
-  }, detailsForBuild)), dialects.ESM === dialect && _objectSpread2({
-    packageProperties: {
+      }
+    }), dialects.ESM === dialect && {
       main: './lib/index.es.js',
-      exports: './lib/index.es.js',
-      sideEffects: false,
-      files: ['lib/']
-    }
-  }, detailsForBuild)), dialects.TYPESCRIPT === dialect && _objectSpread2({
-    packageProperties: {
+      exports: './lib/index.es.js'
+    }), dialects.TYPESCRIPT === dialect && {
       main: './lib/index.cjs.js',
       module: './lib/index.es.js',
       types: './lib/index.d.ts',
@@ -1166,16 +1137,9 @@ async function scaffoldPackageType ({
         types: './lib/index.d.ts',
         require: './lib/index.cjs.js',
         import: './lib/index.es.js'
-      },
-      sideEffects: false,
-      files: ['lib/']
-    }
-  }, detailsForBuild)), dialects.COMMON_JS === dialect && _objectSpread2({
-    packageProperties: {
-      files: ['index.js']
-    }
-  }, detailsForBuild));
-
+      }
+    })
+  })]);
   const chosenType = await chooseApplicationType({
     types: packageTypes,
     projectType: 'package',
@@ -1188,17 +1152,7 @@ async function scaffoldPackageType ({
     tests,
     scope
   });
-  return deepmerge.all([{
-    packageProperties: _objectSpread2({
-      files: ['example.js'],
-      publishConfig: _objectSpread2({
-        access: 'Public' === visibility ? 'public' : 'restricted'
-      }, publishRegistry && {
-        registry: publishRegistry
-      })
-    }, 'Public' === visibility && {
-      runkitExampleFilename: './example.js'
-    }),
+  return deepmerge.all([_objectSpread2(_objectSpread2({}, detailsForBuild), {}, {
     documentation: scaffoldPackageDocumentation({
       packageName,
       visibility,
@@ -1213,7 +1167,7 @@ async function scaffoldPackageType ({
     }],
     scripts: {},
     badges: defineBadges(packageName, visibility)
-  }, results, details]);
+  }), results]);
 }
 
 const defaultBuildDirectory$1 = 'lib';
@@ -1227,11 +1181,16 @@ async function scaffoldApplicationType ({
   decisions
 }) {
   info('Scaffolding Application Details');
-  const chosenType = await chooseApplicationType({
+  const [chosenType] = await Promise.all([chooseApplicationType({
     types: applicationTypes,
     projectType: 'application',
     decisions
-  });
+  }), mergeIntoExistingPackageJson({
+    projectRoot,
+    config: {
+      private: true
+    }
+  })]);
   const results = await scaffoldChoice(applicationTypes, chosenType, {
     projectRoot,
     projectName,
@@ -1253,9 +1212,6 @@ async function scaffoldApplicationType ({
       directories: [`/${buildDirectory}/`]
     },
     buildDirectory,
-    packageProperties: {
-      private: true
-    },
     eslintConfigs: [],
     nextSteps: []
   }, results);
@@ -1297,11 +1253,22 @@ async function scaffoldCliType ({
   dialect,
   publishRegistry
 }) {
-  const rollupResults = await scaffold$1({
+  const [rollupResults] = await Promise.all([scaffold$1({
     projectRoot,
     dialect,
     projectType: projectTypes.CLI
-  });
+  }), mergeIntoExistingPackageJson({
+    projectRoot,
+    config: {
+      bin: {},
+      files: [`${defaultBuildDirectory}/`],
+      publishConfig: _objectSpread2({
+        access: 'Public' === visibility ? 'public' : 'restricted'
+      }, publishRegistry && {
+        registry: publishRegistry
+      })
+    }
+  })]);
   return deepmerge(rollupResults, {
     scripts: {
       clean: `rimraf ./${defaultBuildDirectory}`,
@@ -1317,16 +1284,6 @@ async function scaffoldCliType ({
     },
     buildDirectory: defaultBuildDirectory,
     badges: defineBadges(packageName, visibility),
-    packageProperties: {
-      version: '0.0.0-semantically-released',
-      bin: {},
-      files: [`${defaultBuildDirectory}/`],
-      publishConfig: _objectSpread2({
-        access: 'Public' === visibility ? 'public' : 'restricted'
-      }, publishRegistry && {
-        registry: publishRegistry
-      })
-    },
     eslintConfigs: [],
     nextSteps: []
   });
@@ -1466,7 +1423,7 @@ async function scaffoldRemark ({
   vcs,
   dialect
 }) {
-  await write$1({
+  await write({
     format: fileTypes.JSON,
     path: projectRoot,
     name: 'remark',
@@ -1683,6 +1640,19 @@ async function scaffolder (options) {
     level: 'secondary'
   });
   const packageName = buildPackageName(projectName, scope);
+  const {
+    homepage: projectHomepage
+  } = await scaffoldPackage({
+    projectRoot,
+    projectType,
+    dialect,
+    packageName,
+    license,
+    vcs,
+    author,
+    description,
+    pathWithinParent
+  });
   const projectTypeResults = await scaffoldProjectType({
     projectType,
     projectRoot,
@@ -1752,20 +1722,6 @@ async function scaffolder (options) {
     configs,
     pathWithinParent
   })])), projectTypeResults, verificationResults, npmResults, dialectResults]);
-  const {
-    homepage: projectHomepage
-  } = await scaffoldPackage({
-    projectRoot,
-    projectType,
-    dialect,
-    packageName,
-    license,
-    vcs,
-    author,
-    description,
-    packageProperties: mergedContributions.packageProperties,
-    pathWithinParent
-  });
   const liftResults = await lift({
     results: deepmerge({
       devDependencies: ['npm-run-all'],