@form8ion/javascript 11.10.4 → 12.0.0-beta.1

package/lib/index.mjs

@@ -8,12 +8,11 @@ import { scaffold, lift as lift$3 } from '@form8ion/codecov';
 import { write as write$1 } from '@form8ion/config-file';
 import { info, warn, error } from '@travi/cli-messages';
 import * as commitConventionPlugin from '@form8ion/commit-convention';
-import { scaffold as scaffold$5 } from '@form8ion/commit-convention';
+import { scaffold as scaffold$4 } from '@form8ion/commit-convention';
 import execa from '@form8ion/execa-wrapper';
 import npmConf from 'npm-conf';
 import { EOL } from 'os';
 import validatePackageName from 'validate-npm-package-name';
-import { scaffold as scaffold$3 } from '@form8ion/rollup';
 import { promises } from 'fs';
 import mustache from 'mustache';
 import mkdir from 'make-dir';
@@ -22,7 +21,7 @@ import camelcase from 'camelcase';
 import { resolve } from 'path';
 import filedirname from 'filedirname';
 import * as huskyPlugin from '@form8ion/husky';
-import { scaffold as scaffold$4 } from '@form8ion/husky';
+import { scaffold as scaffold$3 } from '@form8ion/husky';
 import { stringify, parse } from 'ini';
 import { scaffold as scaffold$2 } from '@form8ion/prettier';
 import * as eslintPlugin from '@form8ion/eslint';
@@ -631,10 +630,18 @@ async function scaffoldMonorepoType ({projectRoot}) {
 
 const defaultBuildDirectory = 'bin';
 
-async function scaffoldCliType ({packageName, visibility, projectRoot, dialect, publishRegistry}) {
+async function scaffoldCliType ({
+  packageName,
+  visibility,
+  projectRoot,
+  dialect,
+  publishRegistry,
+  decisions,
+  packageBundlers
+}) {
   const packageAccessLevel = determinePackageAccessLevelFromProjectVisibility({projectVisibility: visibility});
-  const [rollupResults, publishableResults] = await Promise.all([
-    scaffold$3({projectRoot, dialect, projectType: projectTypes$1.CLI}),
+  const [bundlerResults, publishableResults] = await Promise.all([
+    scaffoldBundler({bundlers: packageBundlers, projectRoot, dialect, decisions, projectType: projectTypes$1.CLI}),
     scaffoldPublishable({packageName, packageAccessLevel}),
     mergeIntoExistingPackageJson({
       projectRoot,
@@ -651,7 +658,7 @@ async function scaffoldCliType ({packageName, visibility, projectRoot, dialect,
 
   return deepmerge.all([
     publishableResults,
-    rollupResults,
+    bundlerResults,
     {
       scripts: {
         clean: `rimraf ./${defaultBuildDirectory}`,
@@ -710,7 +717,15 @@ async function scaffoldProjectType ({
     case projectTypes$1.APPLICATION:
       return scaffoldApplicationType({projectRoot});
     case projectTypes$1.CLI:
-      return scaffoldCliType({packageName, visibility, projectRoot, dialect, publishRegistry});
+      return scaffoldCliType({
+        packageName,
+        visibility,
+        projectRoot,
+        dialect,
+        publishRegistry,
+        decisions,
+        packageBundlers
+      });
     case projectTypes$1.MONOREPO:
       return scaffoldMonorepoType({projectRoot});
     case 'Other':
@@ -1594,7 +1609,7 @@ async function scaffoldVerification({
       pathWithinParent
     }),
     scaffoldLinting({projectRoot, packageManager, registries, vcs, pathWithinParent}),
-    scaffold$4({projectRoot, packageManager, pathWithinParent})
+    scaffold$3({projectRoot, packageManager, pathWithinParent})
   ]);
 
   return deepmerge.all([testingResults, lintingResults, huskyResults]);
@@ -1719,7 +1734,7 @@ async function scaffolder (options) {
         {buildDirectory: `./${projectTypeResults.buildDirectory}`, projectRoot, projectName, nodeVersion}
       ),
       scaffoldChoice(ciServices, ci, {projectRoot, vcs, visibility, projectType, projectName, nodeVersion, tests}),
-      scaffold$5({projectRoot, projectType, configs, pathWithinParent})
+      scaffold$4({projectRoot, projectType, configs, pathWithinParent})
     ])),
     projectTypeResults,
     verificationResults,