Merge branch 'main' into ulises/ci-revamp

Author: UlisesGascon

.github/dependabot.yml

@@ -6,54 +6,6 @@ updates:
           interval: "monthly"
       open-pull-requests-limit: 10
       ignore:
-          # ESM only version
-          - dependency-name: 'configstore'
-            versions: ['>=6']
-          # ESM only version
-          - dependency-name: 'got'
-            versions: ['>=9']
-          # ESM only version
-          - dependency-name: 'figures'
-            versions: ['>=4']
-          # ESM only version
-          - dependency-name: 'fullname'
-            versions: ['>=5']
-          # Avoid breaking changes to existing generators, kebab-case vs camelCase argument behavior changes needs to be properly tested
-          - dependency-name: 'meow'
-            versions: ['>=6']
-          # ESM only version
-          - dependency-name: 'npm-keyword'
-            versions: ['>=7']
-          # ESM only version
-          - dependency-name: 'open'
-            versions: ['>=9']
-          # ESM only version
-          - dependency-name: 'p-queue'
-            versions: ['>=7']
-          # ESM only version
-          - dependency-name: 'package-json'
-            versions: ['>=7']
-          # ESM only version
-          - dependency-name: 'read-pkg-up'
-            versions: ['>=8']
-          # ESM only version
-          - dependency-name: 'sort-on'
-            versions: ['>=5']
-          # ESM only version
-          - dependency-name: 'string-length'
-            versions: ['>=5']
-          # ESM only version
-          - dependency-name: 'update-notifier'
-            versions: ['>=6']
-          # ESM only version
-          - dependency-name: 'yeoman-character'
-            versions: ['>=2']
-          # ESM only version
-          - dependency-name: 'titleize'
-            versions: ['>=3']
-          # ESM only version
-          - dependency-name: 'yosay'
-            versions: ['>=3']
           - dependency-name: '*'
             update-types: ["version-update:semver-minor", "version-update:semver-patch"]
     - package-ecosystem: "github-actions"

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 yarn.lock
-.nyc_output
+coverage
 .project

.mocharc.cjs

@@ -0,0 +1,5 @@
+/** @type {import('mocha').MochaOptions} */
+module.exports = {
+  timeout: 20000,
+  parallel: true,
+};

.travis.yml

@@ -1,50 +1,41 @@
 #!/usr/bin/env node
-'use strict';
-const fs = require('fs');
-const path = require('path');
-const chalk = require('chalk');
-const updateNotifier = require('update-notifier');
-const yosay = require('yosay');
-const stringLength = require('string-length');
-const rootCheck = require('root-check');
-const meow = require('meow');
-const list = require('cli-list');
-const Tabtab = require('tabtab');
-const pkg = require('../package.json');
-const Router = require('./router');
-
-const gens = list(process.argv.slice(2));
-
-// Override http networking to go through a proxy ifone is configured
-const MAJOR_NODEJS_VERSION = Number.parseInt(process.version.slice(1).split('.')[0], 10);
-
-if (MAJOR_NODEJS_VERSION >= 10) {
-  // `global-agent` works with Node.js v10 and above.
-  require('global-agent').bootstrap();
-} else {
-  // `global-tunnel-ng` works only with Node.js v10 and below.
-  require('global-tunnel-ng').initialize();
-}
-
-/* eslint new-cap: 0, no-extra-parens: 0 */
-const tabtab = new Tabtab.Commands.default({
-  name: 'yo',
-  completer: 'yo-complete'
-});
-
-const cli = gens.map(gen => {
-  const minicli = meow({autoHelp: false, autoVersion: true, pkg, argv: gen});
+import fs from 'node:fs';
+import path from 'node:path';
+import process from 'node:process';
+import chalk from 'chalk';
+import updateNotifier from 'update-notifier';
+import yosay from 'yosay';
+import stringLength from 'string-length';
+import rootCheck from 'root-check';
+import meow from 'meow';
+import list from 'cli-list';
+import {bootstrap} from 'global-agent';
+import Tabtab from './completion/tabtab.cjs';
+import pkg from './utils/project-package.js';
+import Router from './router.js';
+import * as routes from './routes/index.js';
+import {getDirname} from './utils/node-shims.js';
+
+const __dirname = getDirname(import.meta.url);
+const generators = list(process.argv.slice(2));
+
+bootstrap();
+
+const cli = generators.map(generator => {
+  const minicli = meow({
+    autoHelp: false, autoVersion: true, pkg, argv: generator, importMeta: import.meta,
+  });
   const options = minicli.flags;
-  const args = minicli.input;
+  const arguments_ = minicli.input;
 
   // Add un-camelized options too, for legacy
   // TODO: Remove some time in the future when generators have upgraded
   for (const key of Object.keys(options)) {
-    const legacyKey = key.replace(/[A-Z]/g, m => `-${m.toLowerCase()}`);
+    const legacyKey = key.replaceAll(/[A-Z]/g, m => `-${m.toLowerCase()}`);
     options[legacyKey] = options[key];
   }
 
-  return {opts: options, args};
+  return {opts: options, args: arguments_};
 });
 
 const firstCmd = cli[0] || {opts: {}, args: {}};
@@ -57,7 +48,7 @@ function updateCheck() {
   if (notifier.update) {
     message.push(
       'Update available: ' + chalk.green.bold(notifier.update.latest) + chalk.gray(' (current: ' + notifier.update.current + ')'),
-      'Run ' + chalk.magenta('npm install -g ' + pkg.name) + ' to update.'
+      'Run ' + chalk.magenta('npm install -g ' + pkg.name) + ' to update.',
     );
     console.log(yosay(message.join(' '), {maxLength: stringLength(message[0])}));
   }
@@ -66,17 +57,26 @@ function updateCheck() {
 async function pre() {
   // Debugging helper
   if (cmd === 'doctor') {
-    require('yeoman-doctor')();
+    const {default: yeomanDoctor} = await import('yeoman-doctor');
+    yeomanDoctor();
     return;
   }
 
   if (cmd === 'completion') {
+    // eslint-disable-next-line new-cap
+    const tabtab = new Tabtab.Commands.default({
+      name: 'yo',
+      completer: 'yo-complete',
+      cache: false,
+    });
+
     return tabtab.install();
   }
 
   // Easteregg
   if (cmd === 'yeoman' || cmd === 'yo') {
-    console.log(require('yeoman-character'));
+    const {default: yeomanCharacter} = await import('yeoman-character');
+    console.log(yeomanCharacter);
     return;
   }
 
@@ -89,9 +89,7 @@ function createGeneratorList(env) {
     const generatorName = parts.shift();
 
     // If first time we found this generator, prepare to save all its sub-generators
-    if (!namesByGenerator[generatorName]) {
-      namesByGenerator[generatorName] = [];
-    }
+    namesByGenerator[generatorName] ||= [];
 
     // If sub-generator (!== app), save it
     if (parts[0] !== 'app') {
@@ -118,7 +116,6 @@ const onError = error => {
 };
 
 async function init() {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   const {createEnv} = await import('yeoman-environment');
   const env = createEnv();
 
@@ -163,21 +160,21 @@ async function init() {
   // Note: at some point, nopt needs to know about the generator options, the
   // one that will be triggered by the below args. Maybe the nopt parsing
   // should be done internally, from the args.
-  for (const gen of cli) {
+  for (const generator of cli) {
     // eslint-disable-next-line no-await-in-loop
-    await env.run(gen.args, gen.opts).catch(error => onError(error));
+    await env.run(generator.args, generator.opts).catch(error => onError(error));
   }
 }
 
 function runYo(env) {
   const router = new Router(env);
-  router.registerRoute('help', require('./routes/help'));
-  router.registerRoute('update', require('./routes/update'));
-  router.registerRoute('run', require('./routes/run'));
-  router.registerRoute('install', require('./routes/install'));
-  router.registerRoute('exit', require('./routes/exit'));
-  router.registerRoute('clearConfig', require('./routes/clear-config'));
-  router.registerRoute('home', require('./routes/home'));
+  router.registerRoute('help', routes.help);
+  router.registerRoute('update', routes.update);
+  router.registerRoute('run', routes.run);
+  router.registerRoute('install', routes.install);
+  router.registerRoute('exit', routes.exit);
+  router.registerRoute('clearConfig', routes.clearConfig);
+  router.registerRoute('home', routes.home);
 
   process.once('exit', router.navigate.bind(router, 'exit'));
 
@@ -189,6 +186,7 @@ rootCheck('\n' + chalk.red('Easy with the `sudo`. Yeoman is the master around he
 
 updateCheck();
 
+// eslint-disable-next-line unicorn/prefer-top-level-await
 (async function () {
   await pre();
 })();

lib/cli.js

@@ -1,7 +1,7 @@
-'use strict';
-const path = require('path');
-const {execFile} = require('child_process');
-const parseHelp = require('parse-help');
+import path from 'node:path';
+import {execFile} from 'node:child_process';
+import parseHelp from 'parse-help';
+import {getDirname} from '../utils/node-shims.js';
 
 /**
  * The Completer is in charge of handling `yo-complete` behavior.
@@ -39,9 +39,9 @@ class Completer {
    */
   generator(data, done) {
     const {last} = data;
-    const bin = path.resolve(__dirname, '../cli.js');
+    const binary = path.resolve(getDirname(import.meta.url), '../cli.js');
 
-    execFile('node', [bin, last, '--help'], (error, out) => {
+    execFile('node', [binary, last, '--help'], (error, out) => {
       if (error) {
         done(error);
         return;
@@ -62,13 +62,13 @@ class Completer {
     return item => {
       const name = typeof item === 'string' ? item : item.name;
       desc = typeof item !== 'string' && item.description ? item.description : desc;
-      desc = desc.replace(/^#?\s*/g, '');
-      desc = desc.replace(/:/g, '->');
-      desc = desc.replace(/'/g, ' ');
+      desc = desc.replaceAll(/^#?\s*/g, '');
+      desc = desc.replaceAll(':', '->');
+      desc = desc.replaceAll('\'', ' ');
 
       return {
         name: prefix + name,
-        description: desc
+        description: desc,
       };
     };
   }
@@ -103,4 +103,4 @@ class Completer {
   }
 }
 
-module.exports = Completer;
+export default Completer;

lib/completion/completer.js

@@ -1,14 +1,12 @@
 #! /usr/bin/env node
-'use strict';
-const tabtab = require('tabtab')({
+const tabtab = require('./tabtab.cjs')({
   name: 'yo',
-  cache: !process.env.YO_TEST
+  cache: !require('node:process').env.YO_TEST,
 });
-const Completer = require('./completer');
 
 (async () => {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   const {createEnv} = await import('yeoman-environment');
+  const {default: Completer} = await import('./completer.js');
   const completer = new Completer(createEnv());
 
   tabtab.completer = completer;

lib/completion/index.js lib/completion/index.cjslib/completion/index.js renamed to lib/completion/index.cjs

@@ -0,0 +1,3 @@
+const tabtab = require('tabtab');
+
+module.exports = tabtab;