@form8ion/javascript 6.0.0-alpha.4 → 6.0.1

package/lib/index.js

@@ -25,8 +25,8 @@ var makeDir = require('make-dir');
 var touch = require('touch');
 var path = require('path');
 var huskyPlugin = require('@form8ion/husky');
-var eslint = require('@form8ion/eslint');
 var configFile = require('@form8ion/config-file');
+var eslint = require('@form8ion/eslint');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -471,6 +471,7 @@ async function lift ({
     scripts,
     tags,
     eslintConfigs,
+    eslint: eslint$1,
     dependencies,
     devDependencies,
     packageManager: manager
@@ -481,7 +482,7 @@ async function lift ({
   });
   const eslintResults = await eslint.lift({
     projectRoot,
-    configs: eslintConfigs
+    configs: [...(eslintConfigs || []), ...((eslint$1 === null || eslint$1 === void 0 ? void 0 : eslint$1.configs) || [])]
   });
   const enhancerResults = await core.applyEnhancers({
     results,
@@ -1421,78 +1422,10 @@ async function scaffoldTesting ({
   }) : {};
   return deepmerge__default["default"]({
     devDependencies: [...(unit || integration ? ['@travi/any'] : [])],
-    eslint: [],
-    eslintConfigs: []
+    eslint: {}
   }, unitResults);
 }
 
-async function scaffoldEslint ({
-  config,
-  projectRoot,
-  buildDirectory,
-  additionalConfiguration
-}) {
-  const {
-    scope
-  } = config;
-  const {
-    ignore
-  } = additionalConfiguration;
-  const ignores = deepmerge__default["default"](ignore, {
-    directories: [`/${buildDirectory}/`]
-  });
-  return eslint.scaffold({
-    scope,
-    projectRoot,
-    ignore: {
-      directories: ignores.directories
-    }
-  });
-}
-
-async function scaffoldRemark ({
-  config,
-  projectRoot,
-  projectType,
-  vcs,
-  dialect
-}) {
-  await configFile.write({
-    format: core.fileTypes.JSON,
-    path: projectRoot,
-    name: 'remark',
-    config: {
-      settings: {
-        listItemIndent: 1,
-        emphasis: '_',
-        strong: '_',
-        bullet: '*',
-        incrementListMarker: false
-      },
-      plugins: [config, ['remark-toc', {
-        tight: true
-      }], ...(javascriptCore.projectTypes.PACKAGE === projectType ? [['remark-usage', {
-        heading: 'example'
-      }]] : []), ...(!vcs ? [['validate-links', {
-        repository: false
-      }]] : [])]
-    }
-  });
-  return deepmerge__default["default"]({
-    devDependencies: [config, 'remark-cli', 'remark-toc'],
-    scripts: {
-      'lint:md': 'remark . --frail',
-      'generate:md': 'remark . --output'
-    }
-  }, _objectSpread2({}, javascriptCore.projectTypes.PACKAGE === projectType && _objectSpread2({
-    devDependencies: ['remark-usage']
-  }, javascriptCore.dialects.COMMON_JS !== dialect && {
-    scripts: {
-      'pregenerate:md': 'run-s build'
-    }
-  })));
-}
-
 function scaffoldBanSensitiveFiles ({
   pathWithinParent
 }) {
@@ -1554,32 +1487,15 @@ async function scaffoldLockfileLint ({
 
 async function scaffoldLinting ({
   projectRoot,
-  projectType,
   packageManager,
-  dialect,
   registries,
-  configs,
   vcs,
-  configureLinting,
-  buildDirectory,
-  pathWithinParent,
-  eslint
+  pathWithinParent
 }) {
   return deepmerge__default["default"].all(await Promise.all([scaffoldLockfileLint({
     projectRoot,
     packageManager,
     registries
-  }), configs.eslint && configureLinting ? scaffoldEslint({
-    projectRoot,
-    config: configs.eslint,
-    buildDirectory,
-    additionalConfiguration: eslint
-  }) : {}, scaffoldRemark({
-    projectRoot,
-    projectType,
-    dialect,
-    vcs,
-    config: configs.remark || '@form8ion/remark-lint-preset'
   }), vcs ? scaffoldBanSensitiveFiles({
     pathWithinParent
   }) : {}]));
@@ -1587,22 +1503,17 @@ async function scaffoldLinting ({
 
 async function scaffoldVerification({
   projectRoot,
-  projectType,
   dialect,
   visibility,
   packageManager,
   vcs,
-  configs,
   registries,
-  configureLinting,
   tests,
   unitTestFrameworks,
   decisions,
-  buildDirectory,
-  eslintConfigs,
   pathWithinParent
 }) {
-  const [testingResults, huskyResults] = await Promise.all([scaffoldTesting({
+  const [testingResults, lintingResults, huskyResults] = await Promise.all([scaffoldTesting({
     projectRoot,
     tests,
     visibility,
@@ -1611,29 +1522,109 @@ async function scaffoldVerification({
     decisions,
     dialect,
     pathWithinParent
+  }), scaffoldLinting({
+    projectRoot,
+    packageManager,
+    registries,
+    vcs,
+    pathWithinParent
   }), huskyPlugin.scaffold({
     projectRoot,
     packageManager,
     pathWithinParent
   })]);
-  const lintingResults = await scaffoldLinting({
+  return deepmerge__default["default"].all([testingResults, lintingResults, huskyResults]);
+}
+
+async function scaffoldEslint ({
+  config,
+  projectRoot,
+  buildDirectory,
+  additionalConfiguration
+}) {
+  const {
+    scope
+  } = config;
+  const {
+    ignore
+  } = additionalConfiguration;
+  const ignores = deepmerge__default["default"](ignore, {
+    directories: [`/${buildDirectory}/`]
+  });
+  return eslint.scaffold({
+    scope,
+    projectRoot,
+    ignore: {
+      directories: ignores.directories
+    }
+  });
+}
+
+async function scaffoldRemark ({
+  config,
+  projectRoot,
+  projectType,
+  vcs,
+  dialect
+}) {
+  await configFile.write({
+    format: core.fileTypes.JSON,
+    path: projectRoot,
+    name: 'remark',
+    config: {
+      settings: {
+        listItemIndent: 1,
+        emphasis: '_',
+        strong: '_',
+        bullet: '*',
+        incrementListMarker: false
+      },
+      plugins: [config, ['remark-toc', {
+        tight: true
+      }], ...(javascriptCore.projectTypes.PACKAGE === projectType ? [['remark-usage', {
+        heading: 'example'
+      }]] : []), ...(!vcs ? [['validate-links', {
+        repository: false
+      }]] : [])]
+    }
+  });
+  return deepmerge__default["default"]({
+    devDependencies: [config, 'remark-cli', 'remark-toc'],
+    scripts: {
+      'lint:md': 'remark . --frail',
+      'generate:md': 'remark . --output'
+    }
+  }, _objectSpread2({}, javascriptCore.projectTypes.PACKAGE === projectType && _objectSpread2({
+    devDependencies: ['remark-usage']
+  }, javascriptCore.dialects.COMMON_JS !== dialect && {
+    scripts: {
+      'pregenerate:md': 'run-s build'
+    }
+  })));
+}
+
+async function scaffoldCodeStyle ({
+  projectRoot,
+  projectType,
+  dialect,
+  configs,
+  vcs,
+  configureLinting,
+  buildDirectory,
+  eslint
+}) {
+  return deepmerge__default["default"].all(await Promise.all([configs.eslint && configureLinting ? scaffoldEslint({
+    projectRoot,
+    config: configs.eslint,
+    buildDirectory,
+    additionalConfiguration: eslint
+  }) : {}, scaffoldRemark({
     projectRoot,
     projectType,
-    packageManager,
     dialect,
-    configs,
-    registries,
     vcs,
-    configureLinting,
-    buildDirectory,
-    pathWithinParent,
-    eslint: deepmerge__default["default"].all([testingResults.eslint, {
-      configs: testingResults.eslintConfigs
-    }, {
-      configs: eslintConfigs
-    }])
-  });
-  return deepmerge__default["default"].all([testingResults, lintingResults, huskyResults]);
+    config: configs.remark || '@form8ion/remark-lint-preset'
+  })]));
 }
 
 async function scaffolder (options) {
@@ -1687,7 +1678,7 @@ async function scaffolder (options) {
     description,
     pathWithinParent
   });
-  const projectTypeResults = await scaffoldProjectType({
+  const [projectTypeResults, verificationResults] = await Promise.all([scaffoldProjectType({
     projectType,
     projectRoot,
     projectName,
@@ -1704,25 +1695,19 @@ async function scaffolder (options) {
     decisions,
     dialect,
     publishRegistry: registries.publish
-  });
-  const verificationResults = await scaffoldVerification({
+  }), scaffoldVerification({
     projectRoot,
-    projectType,
     dialect,
-    packageManager,
     visibility,
+    packageManager,
     vcs,
-    configs,
     registries,
-    configureLinting,
     tests,
     unitTestFrameworks,
     decisions,
-    pathWithinParent,
-    buildDirectory: projectTypeResults.buildDirectory,
-    eslintConfigs: projectTypeResults.eslintConfigs
-  });
-  const [nodeVersion, npmResults, dialectResults] = await Promise.all([scaffoldNodeVersion({
+    pathWithinParent
+  })]);
+  const [nodeVersion, npmResults, dialectResults, codeStyleResults] = await Promise.all([scaffoldNodeVersion({
     projectRoot,
     nodeVersionCategory
   }), scaffoldNpmConfig({
@@ -1736,6 +1721,15 @@ async function scaffolder (options) {
     projectType,
     buildDirectory: projectTypeResults.buildDirectory,
     testFilenamePattern: verificationResults.testFilenamePattern
+  }), scaffoldCodeStyle({
+    projectRoot,
+    projectType,
+    dialect,
+    configs,
+    vcs,
+    configureLinting,
+    buildDirectory: projectTypeResults.buildDirectory,
+    eslint: verificationResults.eslint
   })]);
   const mergedContributions = deepmerge__default["default"].all([...(await Promise.all([javascriptCore.scaffoldChoice(hosts, chosenHost, {
     buildDirectory: `./${projectTypeResults.buildDirectory}`,
@@ -1755,7 +1749,7 @@ async function scaffolder (options) {
     projectType,
     configs,
     pathWithinParent
-  })])), projectTypeResults, verificationResults, npmResults, dialectResults]);
+  })])), projectTypeResults, verificationResults, codeStyleResults, npmResults, dialectResults]);
   const liftResults = await lift({
     results: deepmerge__default["default"]({
       devDependencies: ['npm-run-all'],