@form8ion/javascript 7.2.3 → 7.2.6

package/lib/index.mjs

@@ -15,7 +15,7 @@ import npmConf from 'npm-conf';
 import { stringify } from 'ini';
 import { EOL } from 'os';
 import validatePackageName from 'validate-npm-package-name';
-import { scaffold as scaffold$1 } from '@form8ion/rollup';
+import { scaffold as scaffold$3 } from '@form8ion/rollup';
 import mustache from 'mustache';
 import camelcase from 'camelcase';
 import makeDir from 'make-dir';
@@ -23,10 +23,10 @@ import touch from 'touch';
 import { resolve } from 'path';
 import filedirname from 'filedirname';
 import * as huskyPlugin from '@form8ion/husky';
-import { scaffold as scaffold$2 } from '@form8ion/husky';
+import { scaffold as scaffold$4 } from '@form8ion/husky';
 import { write as write$1 } from '@form8ion/config-file';
-import { scaffold as scaffold$4 } from '@form8ion/prettier';
-import { lift as lift$4, scaffold as scaffold$3 } from '@form8ion/eslint';
+import { scaffold as scaffold$2 } from '@form8ion/prettier';
+import { scaffold as scaffold$1, lift as lift$4, test as test$2 } from '@form8ion/eslint';
 
 const questionNames$1 = {
   UNIT_TEST_FRAMEWORK: 'unitTestFramework',
@@ -155,6 +155,87 @@ async function scaffoldUnitTesting ({projectRoot, frameworks, decisions, visibil
   ]);
 }
 
+async function scaffoldEslint ({config, projectRoot, additionalConfiguration}) {
+  const {scope} = config;
+  const {ignore} = additionalConfiguration;
+
+  return scaffold$1({scope, projectRoot, ignore});
+}
+
+function lifter$1 ({results: {buildDirectory, eslintConfigs, eslint}, projectRoot}) {
+  return lift$4({projectRoot, configs: [...eslintConfigs || [], ...eslint?.configs || []], buildDirectory});
+}
+
+async function scaffoldRemark ({config, projectRoot, projectType, vcs, dialect}) {
+  await write$1({
+    format: fileTypes.JSON,
+    path: projectRoot,
+    name: 'remark',
+    config: {
+      settings: {
+        listItemIndent: 1,
+        emphasis: '_',
+        strong: '_',
+        bullet: '*',
+        incrementListMarker: false
+      },
+      plugins: [
+        config,
+        ['remark-toc', {tight: true}],
+        ...projectTypes.PACKAGE === projectType ? [['remark-usage', {heading: 'example'}]] : [],
+        ...!vcs ? [['validate-links', {repository: false}]] : []
+      ]
+    }
+  });
+
+  return deepmerge(
+    {
+      devDependencies: [config, 'remark-cli', 'remark-toc'],
+      scripts: {
+        'lint:md': 'remark . --frail',
+        'generate:md': 'remark . --output'
+      }
+    },
+    {
+      ...projectTypes.PACKAGE === projectType && {
+        devDependencies: ['remark-usage'],
+        ...dialects$1.COMMON_JS !== dialect && {scripts: {'pregenerate:md': 'run-s build'}}
+      }
+    }
+  );
+}
+
+async function scaffoldCodeStyle ({
+  projectRoot,
+  projectType,
+  dialect,
+  configs,
+  vcs,
+  configureLinting,
+  eslint
+}) {
+  return deepmerge.all(await Promise.all([
+    configs.eslint
+      && configureLinting
+      && scaffoldEslint({projectRoot, config: configs.eslint, additionalConfiguration: eslint}),
+    scaffoldRemark({
+      projectRoot,
+      projectType,
+      dialect,
+      vcs,
+      config: configs.remark || '@form8ion/remark-lint-preset'
+    }),
+    scaffold$2({projectRoot, config: configs.prettier})
+  ].filter(Boolean)));
+}
+
+var codeStylePlugin = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  scaffold: scaffoldCodeStyle,
+  lift: lifter$1,
+  test: test$2
+});
+
 async function test$1({projectRoot}) {
   const {engines} = JSON.parse(await promises.readFile(`${projectRoot}/package.json`, 'utf8'));
 
@@ -202,8 +283,8 @@ async function scaffoldBabel ({projectRoot, preset}) {
   };
 }
 
-async function lifter ({buildDirectory, projectRoot}) {
-  await addIgnore({ignore: buildDirectory, projectRoot});
+async function lifter ({results, projectRoot}) {
+  await addIgnore({ignore: results.buildDirectory, projectRoot});
 
   return {};
 }
@@ -457,28 +538,23 @@ async function lift ({projectRoot, vcs, results}) {
   const {
     scripts,
     tags,
-    eslintConfigs,
-    eslint,
     dependencies,
     devDependencies,
-    packageManager: manager,
-    buildDirectory
+    packageManager: manager
   } = results;
 
   const packageManager = await resolvePackageManager({projectRoot, packageManager: manager});
 
-  const eslintResults = await lift$4({projectRoot, configs: [...eslintConfigs || [], ...eslint?.configs || []]});
   const enhancerResults = await applyEnhancers({
     results,
-    enhancers: [huskyPlugin, enginesEnhancer, coveragePlugin, commitConventionPlugin, dialects],
-    options: {packageManager, projectRoot, vcs, buildDirectory}
+    enhancers: [huskyPlugin, enginesEnhancer, coveragePlugin, commitConventionPlugin, dialects, codeStylePlugin],
+    options: {packageManager, projectRoot, vcs}
   });
 
   await liftPackage(
     deepmerge.all([
       {projectRoot, scripts, tags, dependencies, devDependencies, packageManager},
-      enhancerResults,
-      eslintResults
+      enhancerResults
     ])
   );
 
@@ -1114,7 +1190,7 @@ const defaultBuildDirectory = 'bin';
 
 async function scaffoldCliType ({packageName, visibility, projectRoot, dialect, publishRegistry}) {
   const [rollupResults] = await Promise.all([
-    scaffold$1({projectRoot, dialect, projectType: projectTypes.CLI}),
+    scaffold$3({projectRoot, dialect, projectType: projectTypes.CLI}),
     mergeIntoExistingPackageJson({
       projectRoot,
       config: {
@@ -1291,15 +1367,17 @@ async function scaffoldLockfileLint ({projectRoot, packageManager, registries})
     );
   }
 
-  await promises.writeFile(
-    `${projectRoot}/.lockfile-lintrc.json`,
-    JSON.stringify({
+  await write$1({
+    name: 'lockfile-lint',
+    format: fileTypes.JSON,
+    path: projectRoot,
+    config: {
       path: determineLockfilePathFor(packageManager),
       type: packageManager,
       'validate-https': true,
       'allowed-hosts': buildAllowedHostsList({packageManager, registries})
-    })
-  );
+    }
+  });
 
   return {
     devDependencies: ['lockfile-lint'],
@@ -1338,88 +1416,12 @@ async function scaffoldVerification({
       pathWithinParent
     }),
     scaffoldLinting({projectRoot, packageManager, registries, vcs, pathWithinParent}),
-    scaffold$2({projectRoot, packageManager, pathWithinParent})
+    scaffold$4({projectRoot, packageManager, pathWithinParent})
   ]);
 
   return deepmerge.all([testingResults, lintingResults, huskyResults]);
 }
 
-async function scaffoldEslint ({config, projectRoot, buildDirectory, additionalConfiguration}) {
-  const {scope} = config;
-  const {ignore} = additionalConfiguration;
-  const ignores = deepmerge(ignore, {directories: [`/${buildDirectory}/`]});
-
-  return scaffold$3({scope, projectRoot, ignore: {directories: ignores.directories}});
-}
-
-async function scaffoldRemark ({config, projectRoot, projectType, vcs, dialect}) {
-  await write$1({
-    format: fileTypes.JSON,
-    path: projectRoot,
-    name: 'remark',
-    config: {
-      settings: {
-        listItemIndent: 1,
-        emphasis: '_',
-        strong: '_',
-        bullet: '*',
-        incrementListMarker: false
-      },
-      plugins: [
-        config,
-        ['remark-toc', {tight: true}],
-        ...projectTypes.PACKAGE === projectType ? [['remark-usage', {heading: 'example'}]] : [],
-        ...!vcs ? [['validate-links', {repository: false}]] : []
-      ]
-    }
-  });
-
-  return deepmerge(
-    {
-      devDependencies: [config, 'remark-cli', 'remark-toc'],
-      scripts: {
-        'lint:md': 'remark . --frail',
-        'generate:md': 'remark . --output'
-      }
-    },
-    {
-      ...projectTypes.PACKAGE === projectType && {
-        devDependencies: ['remark-usage'],
-        ...dialects$1.COMMON_JS !== dialect && {scripts: {'pregenerate:md': 'run-s build'}}
-      }
-    }
-  );
-}
-
-async function scaffoldCodeStyle ({
-  projectRoot,
-  projectType,
-  dialect,
-  configs,
-  vcs,
-  configureLinting,
-  buildDirectory,
-  eslint
-}) {
-  return deepmerge.all(await Promise.all([
-    configs.eslint && configureLinting
-      && scaffoldEslint({
-        projectRoot,
-        config: configs.eslint,
-        buildDirectory,
-        additionalConfiguration: eslint
-      }),
-    scaffoldRemark({
-      projectRoot,
-      projectType,
-      dialect,
-      vcs,
-      config: configs.remark || '@form8ion/remark-lint-preset'
-    }),
-    scaffold$4({projectRoot, config: configs.prettier})
-  ].filter(Boolean)));
-}
-
 async function scaffolder (options) {
   info('Initializing JavaScript project');
 
@@ -1471,38 +1473,36 @@ async function scaffolder (options) {
     description,
     pathWithinParent
   });
-  const [projectTypeResults, verificationResults] = await Promise.all([
-    scaffoldProjectType({
-      projectType,
-      projectRoot,
-      projectName,
-      packageName,
-      packageManager,
-      visibility,
-      applicationTypes,
-      packageTypes,
-      packageBundlers,
-      monorepoTypes,
-      scope,
-      tests,
-      vcs,
-      decisions,
-      dialect,
-      publishRegistry: registries.publish
-    }),
-    scaffoldVerification({
-      projectRoot,
-      dialect,
-      visibility,
-      packageManager,
-      vcs,
-      registries,
-      tests,
-      unitTestFrameworks,
-      decisions,
-      pathWithinParent
-    })
-  ]);
+  const projectTypeResults = await scaffoldProjectType({
+    projectType,
+    projectRoot,
+    projectName,
+    packageName,
+    packageManager,
+    visibility,
+    applicationTypes,
+    packageTypes,
+    packageBundlers,
+    monorepoTypes,
+    scope,
+    tests,
+    vcs,
+    decisions,
+    dialect,
+    publishRegistry: registries.publish
+  });
+  const verificationResults = await scaffoldVerification({
+    projectRoot,
+    dialect,
+    visibility,
+    packageManager,
+    vcs,
+    registries,
+    tests,
+    unitTestFrameworks,
+    decisions,
+    pathWithinParent
+  });
   const [nodeVersion, npmResults, dialectResults, codeStyleResults, projectTypePluginResults] = await Promise.all([
     scaffoldNodeVersion({projectRoot, nodeVersionCategory}),
     scaffoldNpmConfig({projectType, projectRoot, registries}),
@@ -1520,7 +1520,6 @@ async function scaffolder (options) {
       configs,
       vcs,
       configureLinting,
-      buildDirectory: projectTypeResults.buildDirectory,
       eslint: verificationResults.eslint
     }),
     scaffoldProjectTypePlugin({