@form8ion/javascript 3.1.0-alpha.2 → 3.1.0-alpha.3

package/lib/index.cjs.js

@@ -24,7 +24,7 @@ var camelcase = require('camelcase');
 var makeDir = require('make-dir');
 var touch = require('touch');
 var path = require('path');
-var husky = require('@form8ion/husky');
+var huskyPlugin = require('@form8ion/husky');
 var eslint = require('@form8ion/eslint');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -56,6 +56,7 @@ var mustache__default = /*#__PURE__*/_interopDefaultLegacy(mustache);
 var camelcase__default = /*#__PURE__*/_interopDefaultLegacy(camelcase);
 var makeDir__default = /*#__PURE__*/_interopDefaultLegacy(makeDir);
 var touch__default = /*#__PURE__*/_interopDefaultLegacy(touch);
+var huskyPlugin__namespace = /*#__PURE__*/_interopNamespace(huskyPlugin);
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -156,17 +157,29 @@ function nycIsConfigured ({
   return core.fileExists(`${projectRoot}/.nycrc`);
 }
 
+async function removeDependencies ({
+  packageManager,
+  dependencies
+}) {
+  await execa__default["default"](packageManager, ['remove', ...dependencies]);
+}
+
 async function removeNyc ({
-  projectRoot
+  projectRoot,
+  packageManager
 }) {
   await Promise.all([fs.promises.unlink(`${projectRoot}/.nycrc`), fs.promises.rmdir(`${projectRoot}/.nyc_output`, {
     recursive: true,
     force: true
+  }), removeDependencies({
+    packageManager,
+    dependencies: ['nyc', '@istanbuljs/nyc-config-babel']
   })]);
 }
 
 async function lift$2({
-  projectRoot
+  projectRoot,
+  packageManager
 }) {
   if (await nycIsConfigured({
     projectRoot
@@ -174,7 +187,8 @@ async function lift$2({
     const [c8Results] = await Promise.all([scaffoldC8({
       projectRoot
     }), removeNyc({
-      projectRoot
+      projectRoot,
+      packageManager
     })]);
     return c8Results;
   }
@@ -237,18 +251,15 @@ async function scaffoldUnitTesting ({
 async function applyEnhancers ({
   results,
   enhancers = {},
-  projectRoot
+  options
 }) {
   cliMessages.info('Applying Enhancers');
   return Object.values(enhancers).reduce(async (acc, enhancer) => {
-    if (await enhancer.test({
-      projectRoot
-    })) {
+    if (await enhancer.test(options)) {
       const previousResults = await acc;
-      return deepmerge__default["default"](previousResults, await enhancer.lift({
-        results: previousResults,
-        projectRoot
-      }));
+      return deepmerge__default["default"](previousResults, await enhancer.lift(_objectSpread2({
+        results: previousResults
+      }, options)));
     }
 
     return acc;
@@ -291,20 +302,6 @@ var enginesEnhancer = /*#__PURE__*/Object.freeze({
   lift: lift$1
 });
 
-function enhanceHuskyEnhancer(packageManager) {
-  return {
-    test: husky.test,
-    lift: ({
-      projectRoot,
-      results
-    }) => husky.lift({
-      projectRoot,
-      results,
-      packageManager
-    })
-  };
-}
-
 async function liftPackage ({
   projectRoot,
   scripts,
@@ -371,8 +368,11 @@ async function lift ({
   });
   const enhancerResults = await applyEnhancers({
     results,
-    enhancers: [enhanceHuskyEnhancer(packageManager), enginesEnhancer, coveragePlugin],
-    projectRoot
+    enhancers: [huskyPlugin__namespace, enginesEnhancer, coveragePlugin],
+    options: {
+      packageManager,
+      projectRoot
+    }
   });
   await liftPackage(deepmerge__default["default"].all([{
     projectRoot,
@@ -1524,7 +1524,7 @@ async function scaffoldVerification({
     decisions,
     dialect,
     pathWithinParent
-  }), husky.scaffold({
+  }), huskyPlugin.scaffold({
     projectRoot,
     packageManager
   })]);