@form8ion/javascript 7.2.2 → 7.2.5

package/lib/index.js

@@ -191,6 +191,87 @@ async function scaffoldUnitTesting ({projectRoot, frameworks, decisions, visibil
   ]);
 }
 
+async function scaffoldEslint ({config, projectRoot, additionalConfiguration}) {
+  const {scope} = config;
+  const {ignore} = additionalConfiguration;
+
+  return eslint.scaffold({scope, projectRoot, ignore});
+}
+
+function lifter$1 ({results: {buildDirectory, eslintConfigs, eslint: eslint$1}, projectRoot}) {
+  return eslint.lift({projectRoot, configs: [...eslintConfigs || [], ...eslint$1?.configs || []], buildDirectory});
+}
+
+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'
+      }
+    },
+    {
+      ...javascriptCore.projectTypes.PACKAGE === projectType && {
+        devDependencies: ['remark-usage'],
+        ...javascriptCore.dialects.COMMON_JS !== dialect && {scripts: {'pregenerate:md': 'run-s build'}}
+      }
+    }
+  );
+}
+
+async function scaffoldCodeStyle ({
+  projectRoot,
+  projectType,
+  dialect,
+  configs,
+  vcs,
+  configureLinting,
+  eslint
+}) {
+  return deepmerge__default["default"].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'
+    }),
+    prettier.scaffold({projectRoot, config: configs.prettier})
+  ].filter(Boolean)));
+}
+
+var codeStylePlugin = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  scaffold: scaffoldCodeStyle,
+  lift: lifter$1,
+  test: eslint.test
+});
+
 async function test$1({projectRoot}) {
   const {engines} = JSON.parse(await fs.promises.readFile(`${projectRoot}/package.json`, 'utf8'));
 
@@ -238,8 +319,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 {};
 }
@@ -390,6 +471,52 @@ async function scaffoldPackage ({
   return {homepage: packageData.homepage};
 }
 
+const details = {
+  [javascriptCore.packageManagers.NPM]: {
+    installationCommand: 'install',
+    installationFlags: {
+      [javascriptCore.DEV_DEPENDENCY_TYPE]: `save-${javascriptCore.DEV_DEPENDENCY_TYPE}`,
+      [javascriptCore.PROD_DEPENDENCY_TYPE]: `save-${javascriptCore.PROD_DEPENDENCY_TYPE}`,
+      exact: 'save-exact'
+    }
+  },
+  [javascriptCore.packageManagers.YARN]: {
+    installationCommand: 'add',
+    installationFlags: {
+      [javascriptCore.DEV_DEPENDENCY_TYPE]: javascriptCore.DEV_DEPENDENCY_TYPE,
+      [javascriptCore.PROD_DEPENDENCY_TYPE]: javascriptCore.PROD_DEPENDENCY_TYPE,
+      exact: 'exact'
+    }
+  }
+};
+
+function getInstallationCommandFor(manager) {
+  return details[manager].installationCommand;
+}
+
+function getDependencyTypeFlag(manager, type) {
+  return details[manager].installationFlags[type];
+}
+
+function getExactFlag(manager) {
+  return details[manager].installationFlags.exact;
+}
+
+async function install$1 (dependencies, dependenciesType, projectRoot, packageManager = javascriptCore.packageManagers.NPM) {
+  if (dependencies.length) {
+    cliMessages.info(`Installing ${dependenciesType} dependencies`, {level: 'secondary'});
+
+    await execa__default["default"](
+      `. ~/.nvm/nvm.sh && nvm use && ${packageManager} ${
+        getInstallationCommandFor(packageManager)
+      } ${[...new Set(dependencies)].join(' ')} --${getDependencyTypeFlag(packageManager, dependenciesType)}${
+        javascriptCore.DEV_DEPENDENCY_TYPE === dependenciesType ? ` --${getExactFlag(packageManager)}` : ''
+      }`,
+      {shell: true, cwd: projectRoot}
+    );
+  } else cliMessages.warn(`No ${dependenciesType} dependencies to install`);
+}
+
 async function liftPackage ({
   projectRoot,
   scripts,
@@ -420,8 +547,8 @@ async function liftPackage ({
   cliMessages.info('Installing dependencies');
 
   try {
-    await javascriptCore.installDependencies(dependencies || [], javascriptCore.PROD_DEPENDENCY_TYPE, projectRoot, packageManager);
-    await javascriptCore.installDependencies([...devDependencies || []], javascriptCore.DEV_DEPENDENCY_TYPE, projectRoot, packageManager);
+    await install$1(dependencies || [], javascriptCore.PROD_DEPENDENCY_TYPE, projectRoot, packageManager);
+    await install$1([...devDependencies || []], javascriptCore.DEV_DEPENDENCY_TYPE, projectRoot, packageManager);
   } catch (e) {
     cliMessages.error('Failed to install dependencies');
   }
@@ -447,28 +574,23 @@ async function lift ({projectRoot, vcs, results}) {
   const {
     scripts,
     tags,
-    eslintConfigs,
-    eslint: eslint$1,
     dependencies,
     devDependencies,
-    packageManager: manager,
-    buildDirectory
+    packageManager: manager
   } = results;
 
   const packageManager = await resolvePackageManager({projectRoot, packageManager: manager});
 
-  const eslintResults = await eslint.lift({projectRoot, configs: [...eslintConfigs || [], ...eslint$1?.configs || []]});
   const enhancerResults = await core.applyEnhancers({
     results,
-    enhancers: [huskyPlugin__namespace, enginesEnhancer, coveragePlugin, commitConventionPlugin__namespace, dialects],
-    options: {packageManager, projectRoot, vcs, buildDirectory}
+    enhancers: [huskyPlugin__namespace, enginesEnhancer, coveragePlugin, commitConventionPlugin__namespace, dialects, codeStylePlugin],
+    options: {packageManager, projectRoot, vcs}
   });
 
   await liftPackage(
     deepmerge__default["default"].all([
       {projectRoot, scripts, tags, dependencies, devDependencies, packageManager},
-      enhancerResults,
-      eslintResults
+      enhancerResults
     ])
   );
 
@@ -1281,15 +1403,17 @@ async function scaffoldLockfileLint ({projectRoot, packageManager, registries})
     );
   }
 
-  await fs.promises.writeFile(
-    `${projectRoot}/.lockfile-lintrc.json`,
-    JSON.stringify({
+  await configFile.write({
+    name: 'lockfile-lint',
+    format: core.fileTypes.JSON,
+    path: projectRoot,
+    config: {
       path: determineLockfilePathFor(packageManager),
       type: packageManager,
       'validate-https': true,
       'allowed-hosts': buildAllowedHostsList({packageManager, registries})
-    })
-  );
+    }
+  });
 
   return {
     devDependencies: ['lockfile-lint'],
@@ -1334,82 +1458,6 @@ async function scaffoldVerification({
   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'
-      }
-    },
-    {
-      ...javascriptCore.projectTypes.PACKAGE === projectType && {
-        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,
-      dialect,
-      vcs,
-      config: configs.remark || '@form8ion/remark-lint-preset'
-    }),
-    prettier.scaffold({projectRoot, config: configs.prettier})
-  ].filter(Boolean)));
-}
-
 async function scaffolder (options) {
   cliMessages.info('Initializing JavaScript project');
 
@@ -1510,7 +1558,6 @@ async function scaffolder (options) {
       configs,
       vcs,
       configureLinting,
-      buildDirectory: projectTypeResults.buildDirectory,
       eslint: verificationResults.eslint
     }),
     scaffoldProjectTypePlugin({