Merge branch 'v3' into main

Author: mshima

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+    - package-ecosystem: "npm"
+      directory: "/"
+      schedule:
+          interval: daily
+      open-pull-requests-limit: 20
+
+    - package-ecosystem: "github-actions"
+      directory: "/"
+      schedule:
+          interval: "weekly"

.github/workflows/ci.yml

@@ -1,21 +1,28 @@
 name: NPM Test
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request:
+    branches:
+      - '*'
 
 jobs:
   build:
 
     runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [10.x, 12.x]
+        node-version: [12.x, 14.x]
         generator-version: [2.0.5, latest]
 
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-node@v1.2.0
+    - uses: actions/setup-node@v2.1.2
       with:
         node-version: ${{ matrix.node-version }}
     - run: npm ci

.github/workflows/gh_pages.yml

@@ -11,7 +11,7 @@ jobs:
     name: Update api docs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2.1.2
       - run: npm install -g jsdoc prettier
       - uses: actions/checkout@v2
         with:
@@ -24,6 +24,7 @@ jobs:
         run: |
           cd source
           npm ci
+          npm install tui-jsdoc-template --no-package-lock
           jsdoc -c jsdoc.json -d ../out
       - name: Run prettier
         run: |

.github/workflows/integration.yml

@@ -1,6 +1,12 @@
 name: Integration Build
 
-on: [push, pull_request]
+on:
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+  pull_request:
+    branches:
+      - '*'
 
 jobs:
   build:
@@ -10,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        node-version: [12.x]
+        node-version: [14.x]
 
     steps:
     - name: Checkout yeoman-test
@@ -30,30 +36,34 @@ jobs:
       with:
         path: yeoman-environment
 
-    - uses: actions/setup-node@v1
+    - uses: actions/setup-node@v2.1.2
       with:
         node-version: ${{ matrix.node-version }}
 
+    - run: npm install -g npm@^7.0.0
+
     - name: Run yeoman-test test
       run: |
         cd $GITHUB_WORKSPACE/yeoman-test
         npm ci
-        npm install yeoman/generator#master
-        npm install ${{ github.repository }}#$GITHUB_SHA
+        npm install yeoman/generator#main
+        npm install ${{ github.repository }}#$GITHUB_REF
         npm test
 
     - name: Run yeoman-generator test
+      if: always()
       run: |
         cd $GITHUB_WORKSPACE/yeoman-generator
         npm ci
-        npm install yeoman/yeoman-test#master
-        npm install ${{ github.repository }}#$GITHUB_SHA
+        npm install yeoman/yeoman-test#main
+        npm install ${{ github.repository }}#$GITHUB_REF
         npm test
 
     - name: Run yeoman-environment test
+      if: always()
       run: |
         cd $GITHUB_WORKSPACE/yeoman-environment
         npm ci
-        npm install yeoman/yeoman-test#master
-        npm install yeoman/generator#master
+        npm install yeoman/yeoman-test#main
+        npm install yeoman/generator#main
         npm test

.github/workflows/milestone.yml

@@ -11,7 +11,7 @@ jobs:
     if: startsWith(github.event.milestone.title, 'v') && startsWith(github.event.milestone.description, 'Do release')
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2.1.2
       - name: Verify version
         run: |
           npm install -g semver

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v2.1.2
         with:
           registry-url: 'https://registry.npmjs.org/'
 

.github/workflows/stale.yml

@@ -7,11 +7,11 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v1
+    - uses: actions/stale@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'This issue is stale because it has been open more than 45 days with no activity. Remove stale label or comment or this will be closed in 15 days'
-        days-before-stale: 45
-        days-before-close: 15
+        stale-issue-message: 'This issue is stale because it has been open with no activity. Remove stale label or comment or this will be closed'
+        days-before-stale: 30
+        days-before-close: 5
         stale-issue-label: 'stale'
-        exempt-issue-label: 'not stale'
+        exempt-issue-labels: 'not stale'

.github/workflows/triage.yml

@@ -5,7 +5,7 @@ jobs:
   apply-label:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@0.3.0
+      - uses: actions/github-script@v3
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 coverage
 .nyc_output
+/.project

lib/adapter.js

@@ -1,5 +1,4 @@
 'use strict';
-const _ = require('lodash');
 const inquirer = require('inquirer');
 const diff = require('diff');
 const chalk = require('chalk');
@@ -34,8 +33,8 @@ class TerminalAdapter {
     return chalk.bgRed;
   }
 
-  _colorLines(name, str) {
-    return str.split('\n').map(line => this[`_colorDiff${name}`](line)).join('\n');
+  _colorLines(name, string) {
+    return string.split('\n').map(line => this[`_colorDiff${name}`](line)).join('\n');
   }
 
   /**
@@ -49,16 +48,13 @@ class TerminalAdapter {
    *
    * @param {Object|Object[]} questions
    * @param {Object} [answers] Answers to be passed to inquirer
-   * @param {Function} [callback] callback
+   * @return {Object} promise answers
    */
   prompt(questions, answers, cb) {
-    if (typeof answers === 'function') {
-      cb = answers;
-      answers = undefined;
+    if (typeof answers === 'function' || typeof cb === 'function') {
+      throw new TypeError('Callback support have been removed.');
     }
-    const promise = this.promptModule(questions, answers);
-    promise.then(cb || _.noop);
-    return promise;
+    return this.promptModule(questions, answers);
   }
 
   /**
@@ -73,29 +69,29 @@ class TerminalAdapter {
       changes = actual;
     }
     changes = changes || diff.diffLines(actual, expected);
-    let msg = changes.map(str => {
-      if (str.added) {
-        return this._colorLines('Added', str.value);
+    let message = changes.map(string => {
+      if (string.added) {
+        return this._colorLines('Added', string.value);
       }
 
-      if (str.removed) {
-        return this._colorLines('Removed', str.value);
+      if (string.removed) {
+        return this._colorLines('Removed', string.value);
       }
 
-      return str.value;
+      return string.value;
     }).join('');
 
     // Legend
-    msg = '\n' +
+    message = '\n' +
       this._colorDiffRemoved('removed') +
       ' ' +
       this._colorDiffAdded('added') +
       '\n\n' +
-      msg +
+      message +
       '\n';
 
-    this.console.log(msg);
-    return msg;
+    this.console.log(message);
+    return message;
   }
 }