@form8ion/javascript 12.2.0 → 12.3.0

package/lib/index.js

@@ -24,10 +24,10 @@ var camelcase = require('camelcase');
 var path = require('path');
 var filedirname = require('filedirname');
 var huskyPlugin = require('@form8ion/husky');
+var node_fs = require('node:fs');
 var ini = require('ini');
 var prettier = require('@form8ion/prettier');
 var eslintPlugin = require('@form8ion/eslint');
-var node_fs = require('node:fs');
 var sortProperties = require('sort-object-keys');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -250,7 +250,7 @@ async function scaffoldCodeStyle ({
   ].filter(Boolean)));
 }
 
-function lifter$3 (options) {
+function lifter$4 (options) {
   return core.applyEnhancers({options, enhancers: [eslintPlugin__namespace]});
 }
 
@@ -261,7 +261,7 @@ function tester$3 (options) {
 var codeStylePlugin = /*#__PURE__*/Object.freeze({
   __proto__: null,
   scaffold: scaffoldCodeStyle,
-  lift: lifter$3,
+  lift: lifter$4,
   test: tester$3
 });
 
@@ -296,7 +296,7 @@ function tester$2 ({projectRoot}) {
   return core.fileExists(`${projectRoot}/.npmrc`);
 }
 
-async function lifter$2 ({projectRoot}) {
+async function lifter$3 ({projectRoot}) {
   const pathToConfig = `${projectRoot}/.npmrc`;
 
   const {
@@ -314,7 +314,7 @@ var npmConfigPlugin = /*#__PURE__*/Object.freeze({
   __proto__: null,
   scaffold: scaffoldNpmConfig,
   test: tester$2,
-  lift: lifter$2
+  lift: lifter$3
 });
 
 async function test({projectRoot}) {
@@ -787,7 +787,7 @@ function vcsRepositoryHostedOnGithub(vcs) {
   return vcs && 'github' === vcs.host;
 }
 
-async function lifter$1 ({projectRoot, packageDetails, vcs}) {
+async function lifter$2 ({projectRoot, packageDetails, vcs}) {
   if (await isPackage({projectRoot, packageDetails})) return liftPackage$1({projectRoot, packageDetails});
   if (await isCli({projectRoot, packageDetails})) return liftCli({projectRoot, packageDetails});
 
@@ -806,7 +806,7 @@ var projectTypes = /*#__PURE__*/Object.freeze({
   __proto__: null,
   scaffold: scaffoldProjectType,
   test: tester$1,
-  lift: lifter$1
+  lift: lifter$2
 });
 
 function write ({projectRoot, config}) {
@@ -834,7 +834,7 @@ async function scaffoldBabel ({projectRoot, preset}) {
   };
 }
 
-async function lifter ({results, projectRoot}) {
+async function lifter$1 ({results, projectRoot}) {
   await addIgnore({ignore: results.buildDirectory, projectRoot});
 
   return {};
@@ -888,7 +888,7 @@ var dialects = /*#__PURE__*/Object.freeze({
   __proto__: null,
   scaffold: scaffoldDialect,
   test: predicate,
-  lift: lifter
+  lift: lifter$1
 });
 
 function buildPackageDetails ({
@@ -1093,20 +1093,64 @@ async function liftPackage ({
   }
 }
 
+function determineLockfilePathFor (packageManager) {
+  const lockfilePaths = {
+    [javascriptCore.packageManagers.NPM]: 'package-lock.json',
+    [javascriptCore.packageManagers.YARN]: 'yarn.lock'
+  };
+
+  return lockfilePaths[packageManager];
+}
+
+function npmIsUsed ({projectRoot}) {
+  return core.fileExists(`${projectRoot}/${determineLockfilePathFor(javascriptCore.packageManagers.NPM)}`);
+}
+
+function yarnIsUsed ({projectRoot}) {
+  return core.fileExists(`${projectRoot}/${determineLockfilePathFor(javascriptCore.packageManagers.YARN)}`);
+}
+
+async function jsPackageManagerIsUsed ({projectRoot}) {
+  const [npmFound, yarnFound] = await Promise.all([
+    npmIsUsed({projectRoot}),
+    yarnIsUsed({projectRoot})
+  ]);
+
+  return npmFound || yarnFound;
+}
+
+async function liftCorepack () {
+  await execa__default["default"]('corepack', ['use', 'npm@latest']);
+}
+
+async function lifter () {
+  await liftCorepack();
+
+  return {};
+}
+
 async function resolvePackageManager ({projectRoot, packageManager}) {
   if (packageManager) return packageManager;
 
-  if (await core.fileExists(`${projectRoot}/package-lock.json`)) {
+  if (await npmIsUsed({projectRoot})) {
     return javascriptCore.packageManagers.NPM;
   }
 
-  if (await core.fileExists(`${projectRoot}/yarn.lock`)) {
+  if (await yarnIsUsed({projectRoot})) {
     return javascriptCore.packageManagers.YARN;
   }
 
   throw new Error('Package-manager could not be determined');
 }
 
+var packageManagers = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  test: jsPackageManagerIsUsed,
+  lift: lifter,
+  determineCurrent: resolvePackageManager,
+  defineLockfilePath: determineLockfilePathFor
+});
+
 async function lift ({projectRoot, vcs, results, pathWithinParent}) {
   cliMessages.info('Lifting JavaScript-specific details');
 
@@ -1133,7 +1177,8 @@ async function lift ({projectRoot, vcs, results, pathWithinParent}) {
       dialects,
       codeStylePlugin,
       npmConfigPlugin,
-      projectTypes
+      projectTypes,
+      packageManagers
     ],
     options: {packageManager, projectRoot, vcs, packageDetails: JSON.parse(packageContents)}
   });
@@ -1477,13 +1522,17 @@ async function scaffoldNodeVersion ({projectRoot, nodeVersionCategory}) {
 
   const version = await determineLatestVersionOf(nodeVersionCategory);
 
-  await fs.promises.writeFile(`${projectRoot}/.nvmrc`, version);
+  await node_fs.promises.writeFile(`${projectRoot}/.nvmrc`, version);
 
   await install(nodeVersionCategory);
 
   return version;
 }
 
+function nvmIsUsed ({projectRoot}) {
+  return core.fileExists(`${projectRoot}/.nvmrc`);
+}
+
 function buildBadgesDetails (contributors) {
   return deepmerge__default["default"].all(contributors).badges;
 }
@@ -1578,15 +1627,6 @@ function buildAllowedHostsList ({packageManager, registries}) {
 
 const lockfileLintSupportedPackageManagers = [javascriptCore.packageManagers.NPM, javascriptCore.packageManagers.YARN];
 
-function determineLockfilePathFor(packageManager) {
-  const lockfilePaths = {
-    [javascriptCore.packageManagers.NPM]: 'package-lock.json',
-    [javascriptCore.packageManagers.YARN]: 'yarn.lock'
-  };
-
-  return lockfilePaths[packageManager];
-}
-
 function lockfileLintSupports(packageManager) {
   return lockfileLintSupportedPackageManagers.includes(packageManager);
 }
@@ -1797,13 +1837,12 @@ async function scaffolder (options) {
 }
 
 async function tester ({projectRoot}) {
-  const [nvmIsConfigured, packageLockExists, yarnLockExists] = await Promise.all([
-    core.fileExists(`${projectRoot}/.nvmrc`),
-    core.fileExists(`${projectRoot}/package-lock.json`),
-    core.fileExists(`${projectRoot}/yarn.lock`)
+  const [nvmFound, jsPackageManagerFound] = await Promise.all([
+    nvmIsUsed({projectRoot}),
+    jsPackageManagerIsUsed({projectRoot})
   ]);
 
-  return nvmIsConfigured || packageLockExists || yarnLockExists;
+  return nvmFound || jsPackageManagerFound;
 }
 
 const questionNames = {...languageScaffolderPrompts.questionNames, ...questionNames$1};