@form8ion/javascript 3.1.0-alpha.2 → 3.1.0

package/lib/index.es.js

@@ -20,8 +20,9 @@ import camelcase from 'camelcase';
 import makeDir from 'make-dir';
 import touch from 'touch';
 import { resolve } from 'path';
-import { test as test$2, lift as lift$3, scaffold as scaffold$3 } from '@form8ion/husky';
-import { lift as lift$4, scaffold as scaffold$2 } from '@form8ion/eslint';
+import * as huskyPlugin from '@form8ion/husky';
+import { scaffold as scaffold$3 } from '@form8ion/husky';
+import { lift as lift$3, scaffold as scaffold$2 } from '@form8ion/eslint';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -122,17 +123,29 @@ function nycIsConfigured ({
   return fileExists(`${projectRoot}/.nycrc`);
 }
 
+async function removeDependencies ({
+  packageManager,
+  dependencies
+}) {
+  await execa(packageManager, ['remove', ...dependencies]);
+}
+
 async function removeNyc ({
-  projectRoot
+  projectRoot,
+  packageManager
 }) {
   await Promise.all([promises.unlink(`${projectRoot}/.nycrc`), 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
@@ -140,9 +153,17 @@ async function lift$2({
     const [c8Results] = await Promise.all([scaffoldC8({
       projectRoot
     }), removeNyc({
-      projectRoot
+      projectRoot,
+      packageManager
     })]);
-    return c8Results;
+    return deepmerge.all([c8Results, {
+      scripts: {
+        'test:unit': 'cross-env NODE_ENV=test c8 run-s test:unit:base'
+      },
+      nextSteps: [{
+        summary: 'Remove use of `@istanbuljs/nyc-config-babel` from your babel config, if present,' + ' after the migration away from `nyc`'
+      }]
+    }]);
   }
 
   return {};
@@ -203,18 +224,15 @@ async function scaffoldUnitTesting ({
 async function applyEnhancers ({
   results,
   enhancers = {},
-  projectRoot
+  options
 }) {
   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(previousResults, await enhancer.lift({
-        results: previousResults,
-        projectRoot
-      }));
+      return deepmerge(previousResults, await enhancer.lift(_objectSpread2({
+        results: previousResults
+      }, options)));
     }
 
     return acc;
@@ -257,20 +275,6 @@ var enginesEnhancer = /*#__PURE__*/Object.freeze({
   lift: lift$1
 });
 
-function enhanceHuskyEnhancer(packageManager) {
-  return {
-    test: test$2,
-    lift: ({
-      projectRoot,
-      results
-    }) => lift$3({
-      projectRoot,
-      results,
-      packageManager
-    })
-  };
-}
-
 async function liftPackage ({
   projectRoot,
   scripts,
@@ -331,14 +335,17 @@ async function lift ({
     projectRoot,
     packageManager: manager
   });
-  const eslintResults = await lift$4({
+  const eslintResults = await lift$3({
     projectRoot,
     configs: eslintConfigs
   });
   const enhancerResults = await applyEnhancers({
     results,
-    enhancers: [enhanceHuskyEnhancer(packageManager), enginesEnhancer, coveragePlugin],
-    projectRoot
+    enhancers: [huskyPlugin, enginesEnhancer, coveragePlugin],
+    options: {
+      packageManager,
+      projectRoot
+    }
   });
   await liftPackage(deepmerge.all([{
     projectRoot,