Merge branch 'main' into lookup-babel

.github/workflows/nodejs.yml

@@ -28,8 +28,6 @@ jobs:
         run: npm run lint
 
   test:
-    name: Test on Node.js ${{ matrix.node-version }} and ${{ matrix.os }}
-
     strategy:
       fail-fast: false
       matrix:
@@ -41,6 +39,7 @@ jobs:
           - 10.x
           - 12.x
           - 14.x
+          - 15.x
 
     runs-on: ${{ matrix.os }}
 

.github/workflows/test-module.yml

@@ -0,0 +1,62 @@
+name: Test a module with CITGM
+
+on:
+  workflow_dispatch:
+    inputs:
+      module:
+        description: 'Module to test'
+        required: true
+      repository:
+        description: 'CITGM repository to checkout'
+        required: true
+        default: nodejs/citgm
+      ref:
+        description: 'CITGM GitHub ref to checkout'
+        required: true
+        default: main
+
+jobs:
+  show-parameters:
+    name: Parameters for testing "${{ github.event.inputs.module }}"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Log workflow parameters
+        env:
+          WORKFLOW_PARAMETERS: ${{ toJSON(github.event.inputs) }}
+        run: echo "$WORKFLOW_PARAMETERS"
+
+  test-module:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - macos-latest
+          - ubuntu-latest
+          - windows-latest
+        node-version:
+          - 10.x
+          - 12.x
+          - 14.x
+          - 15.x
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ github.event.inputs.repository }}
+          ref: ${{ github.event.inputs.ref }}
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+
+      - name: Install packages
+        run: npm install
+
+      - name: Run CITGM
+        run: node bin/citgm.js ${{ github.event.inputs.module }}

README.md

@@ -127,7 +127,7 @@ For syntax, see [lookup.json](./lib/lookup.json), the available attributes are:
 
 ```
 "npm": true                  Download the module from npm instead of github
-"master": true               Use the master branch
+"head": true                 Use the head of the default branch
 "prefix": "v"                Specify the prefix used in the module version.
 "flaky": true                Ignore failures
 "skip": true                 Completely skip the module

lib/grab-project.js

@@ -12,6 +12,8 @@ async function grabProject(context) {
   }
 
   return new Promise((resolve, reject) => {
+    const packageManager =
+      context.options.yarn || context.module.useYarn ? 'yarn' : 'npm';
     let packageName = context.module.raw;
     if (context.module.type === 'directory') {
       context.module.raw = context.module.name = path.basename(packageName);
@@ -21,7 +23,7 @@ async function grabProject(context) {
     context.emit(
       'data',
       'info',
-      `${context.module.name} npm:`,
+      `${context.module.name} ${packageManager}:`,
       `Downloading project: ${packageName}`
     );
     let options = createOptions(context.path, context);

lib/lookup.js

@@ -12,7 +12,7 @@ function makeUrl(repo, spec, tags, prefix, sha) {
   let version;
   if (!spec)
     // Spec should already have defaulted to latest.
-    version = 'master';
+    version = 'HEAD';
   else if (tags[spec]) version = tags[spec];
   // Matches npm tags like 'latest' or 'next'.
   // `spec` must match one of `meta.versions` as npm info call passed.
@@ -30,7 +30,7 @@ function makeUrl(repo, spec, tags, prefix, sha) {
 
 function makeClone(repo, spec, tags, prefix) {
   let version;
-  if (!spec) version = 'master';
+  if (!spec) version = 'HEAD';
   else version = (prefix || '') + tags[spec];
   return {
     url: `${repo}.git`,
@@ -56,7 +56,27 @@ function getLookupTable(options) {
     if (typeof options.lookup === 'string') {
       name = path.resolve(process.cwd(), options.lookup);
     }
-    return require(name);
+    const lookup = require(name);
+
+    // Backwards-compatibility: replace "master" key with "head".
+    let warningEmitted = false;
+    for (const moduleName of Object.keys(lookup)) {
+      const moduleConfig = lookup[moduleName];
+      if (moduleConfig.master !== undefined) {
+        if (!warningEmitted) {
+          process.emitWarning(
+            'The "master" key in lookup entries is deprecated. Use "head" instead. ' +
+              `Found in "${name}" for module "${moduleName}".`,
+            'DeprecationWarning'
+          );
+          warningEmitted = true;
+        }
+        moduleConfig.head = moduleConfig.master;
+        delete moduleConfig.master;
+      }
+    }
+
+    return lookup;
   } catch (err) {
     return undefined;
   }
@@ -107,7 +127,7 @@ function resolve(context) {
         if (rep.useGitClone) {
           const { url, ref } = makeClone(
             getRepo(rep.repo, meta),
-            rep.master ? null : detail.fetchSpec,
+            rep.head ? null : detail.fetchSpec,
             meta['dist-tags'],
             rep.prefix
           );
@@ -121,12 +141,12 @@ function resolve(context) {
           context.module.raw = url;
           context.module.ref = ref;
         } else {
-          const gitHead = rep.master || rep.ignoreGitHead ? null : meta.gitHead;
+          const gitHead = rep.head || rep.ignoreGitHead ? null : meta.gitHead;
           const url = makeUrl(
             getRepo(rep.repo, meta),
-            rep.master ? null : detail.fetchSpec,
+            rep.head ? null : detail.fetchSpec,
             meta['dist-tags'],
-            rep.master ? null : rep.prefix,
+            rep.head ? null : rep.prefix,
             context.options.sha || rep.sha || gitHead
           );
           context.emit(

lib/lookup.json

@@ -6,6 +6,11 @@
     "scripts": ["build", "test"],
     "skip": ["10.x", "win32", "aix", "s390"]
   },
+  "@hapi/hapi": {
+    "prefix": "v",
+    "maintainers": ["devinivy", "DavidTPate", "AdriVanHoudt"],
+    "skip": ["10", "osx", "aix"]
+  },
   "@hapi/shot": {
     "maintainers": "cjihrig",
     "prefix": "v"
@@ -91,7 +96,7 @@
   },
   "cheerio": {
     "skip": "win32",
-    "master": true,
+    "head": true,
     "maintainers": ["matthewmueller", "jugglinmike"]
   },
   "clinic": {
@@ -143,7 +148,7 @@
     "envVar": { "YARN_IGNORE_ENGINES": "true" },
     "prefix": "v",
     "flaky": ["win32", "rhel", "sles"],
-    "master": true,
+    "head": true,
     "expectFail": "fips",
     "maintainers": ["stefanpenner", "rwjblue", "Turbo87", "kellyselden"]
   },
@@ -160,12 +165,6 @@
     "maintainers": ["nzakas", "mysticatea", "not-an-aardvark"],
     "comment": "Skipped because libX11 is required for headless Chrome"
   },
-  "eslint-plugin-jest": {
-    "prefix": "v",
-    "maintainers": "SimenB",
-    "yarn": true,
-    "skip": ["aix", "s390x"]
-  },
   "esprima": {
     "maintainers": "ariya",
     "expectFail": "fips",
@@ -257,6 +256,15 @@
     "prefix": "v",
     "maintainers": "juliangruber"
   },
+  "jest": {
+    "prefix": "v",
+    "maintainers": ["cpojer", "scotthovestadt", "SimenB", "thymikee", "jeysal"],
+    "yarn": true,
+    "scripts": ["build:js", "test-ci-partial"],
+    "envVar": { "CI": true },
+    "skip": ["aix", "s390x", "ppc", "10.x", "darwin", "win32"],
+    "timeout": 1800000
+  },
   "jquery": {
     "skip": "win32",
     "flaky": ["linux", "aix", "darwin"],
@@ -304,7 +312,7 @@
     "maintainers": "substack"
   },
   "mkdirp": {
-    "master": true,
+    "head": true,
     "skip": true,
     "maintainers": "substack"
   },
@@ -349,6 +357,11 @@
     "comment": "Flaky because of test timeouts",
     "skip": true
   },
+  "npm": {
+    "maintainers": ["nodejs/npm"],
+    "prefix": "v",
+    "skip": "s390"
+  },
   "path-to-regexp": {
     "prefix": "v",
     "maintainers": "blakeembrey",
@@ -446,7 +459,7 @@
   },
   "socket.io": {
     "maintainers": "rauchg",
-    "master": true
+    "head": true
   },
   "spawn-wrap": {
     "prefix": "v",
@@ -469,7 +482,7 @@
   "split2": {
     "prefix": "v",
     "maintainers": "mcollina",
-    "master": true
+    "head": true
   },
   "sqlite3": {
     "prefix": "v",
@@ -526,6 +539,7 @@
     "maintainers": "jashkenas"
   },
   "undici": {
+    "prefix": "v",
     "maintainers": ["mcollina", "ronag"]
   },
   "uuid": {
@@ -540,7 +554,7 @@
   },
   "vinyl-fs": {
     "prefix": "v",
-    "master": true,
+    "head": true,
     "maintainers": ["contra", "phated"],
     "skip": true
   },
@@ -573,7 +587,8 @@
     "prefix": "v",
     "flaky": ["ppc", "rhel"],
     "expectFail": "fips",
-    "maintainers": ["SBoudrias", "sindresorhus"]
+    "maintainers": ["SBoudrias", "sindresorhus"],
+    "skip": "10.x"
   },
   "zeromq": {
     "prefix": "v",

test/fixtures/custom-lookup-log.json

@@ -1,7 +1,7 @@
 {
   "omg-i-pass": {
     "install": ["--extra-param"],
-    "master": true,
+    "head": true,
     "replace": true,
     "repo": "https://github.com/nodejs/citgm"
   }

test/test-lookup.js

@@ -20,9 +20,9 @@ test('lookup: makeUrl', (t) => {
 
   const sha = 'abc123';
 
-  let expected = `${repo}/archive/master.tar.gz`;
+  let expected = `${repo}/archive/HEAD.tar.gz`;
   let url = makeUrl(repo);
-  t.equal(url, expected, 'by default makeUrl should give a link to master');
+  t.equal(url, expected, 'by default makeUrl should give a link to HEAD');
 
   expected = `${repo}/archive/${tags.latest}.tar.gz`;
   url = makeUrl(repo, 'latest', tags);
@@ -171,7 +171,7 @@ test('lookup: module in table', (t) => {
   lookup(context);
   t.equals(
     context.module.raw,
-    'https://github.com/lodash/lodash/archive/master.tar.gz',
+    'https://github.com/lodash/lodash/archive/HEAD.tar.gz',
     'raw should be truthy if the module was in the list'
   );
   t.end();
@@ -404,7 +404,7 @@ test('lookup: logging', (t) => {
     {
       type: 'info',
       key: 'omg-i-pass lookup-replace',
-      msg: 'https://github.com/nodejs/citgm/archive/master.tar.gz'
+      msg: 'https://github.com/nodejs/citgm/archive/HEAD.tar.gz'
     },
     {
       type: 'verbose',