fix: correctly parse browser as config as string

.eslintrc.js

@@ -15,6 +15,7 @@ module.exports = {
     'smoke-tests/**',
     'mock-registry/**',
     'workspaces/**',
+    'mock-globals/**',
   ],
   extends: [
     '@npmcli',

.eslintrc.local.js

@@ -0,0 +1,30 @@
+const { resolve, relative } = require('path')
+
+// Create an override to lockdown a file to es6 syntax only
+// and only allow it to require an allowlist of files
+const res = (p) => resolve(__dirname, p)
+const rel = (p) => relative(__dirname, res(p))
+const braces = (a) => a.length > 1 ? `{${a.map(rel).join(',')}}` : a[0]
+
+const es6Files = (e) => Object.entries(e).map(([file, allow]) => ({
+  files: `./${rel(file)}`,
+  parserOptions: {
+    ecmaVersion: 6,
+  },
+  rules: {
+    'node/no-restricted-require': ['error', [{
+      name: ['/**', `!${__dirname}/${braces(allow)}`],
+      message: `This file can only require: ${allow.join(',')}`,
+    }]],
+  },
+}))
+
+module.exports = {
+  rules: {
+    'no-console': 'error',
+  },
+  overrides: es6Files({
+    'index.js': ['lib/cli/validate-engines.js'],
+    'lib/cli/validate-engines.js': ['package.json', 'lib/cli/index.js'],
+  }),
+}

.github/workflows/ci-npmcli-mock-globals.yml

@@ -0,0 +1,94 @@
+# This file is automatically added by @npmcli/template-oss. Do not edit.
+
+name: CI - @npmcli/mock-globals
+
+on:
+  workflow_dispatch:
+  pull_request:
+    paths:
+      - mock-globals/**
+  push:
+    branches:
+      - main
+      - latest
+    paths:
+      - mock-globals/**
+  schedule:
+    # "At 09:00 UTC (02:00 PT) on Monday" https://crontab.guru/#0_9_*_*_1
+    - cron: "0 9 * * 1"
+
+jobs:
+  lint:
+    name: Lint
+    if: github.repository_owner == 'npm'
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: bash
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Git User
+        run: |
+          git config --global user.email "npm-cli+bot@github.com"
+          git config --global user.name "npm CLI robot"
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+          cache: npm
+      - name: Reset Deps
+        run: node . run resetdeps
+      - name: Lint
+        run: node . run lint --ignore-scripts -w @npmcli/mock-globals
+      - name: Post Lint
+        run: node . run postlint --ignore-scripts -w @npmcli/mock-globals
+
+  test:
+    name: Test - ${{ matrix.platform.name }} - ${{ matrix.node-version }}
+    if: github.repository_owner == 'npm'
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - name: Linux
+            os: ubuntu-latest
+            shell: bash
+          - name: macOS
+            os: macos-latest
+            shell: bash
+          - name: Windows
+            os: windows-latest
+            shell: cmd
+        node-version:
+          - 14.17.0
+          - 14.x
+          - 16.13.0
+          - 16.x
+          - 18.0.0
+          - 18.x
+    runs-on: ${{ matrix.platform.os }}
+    defaults:
+      run:
+        shell: ${{ matrix.platform.shell }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Git User
+        run: |
+          git config --global user.email "npm-cli+bot@github.com"
+          git config --global user.name "npm CLI robot"
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: npm
+      - name: Reset Deps
+        run: node . run resetdeps
+      - name: Add Problem Matcher
+        run: echo "::add-matcher::.github/matchers/tap.json"
+      - name: Test
+        run: node . test --ignore-scripts -w @npmcli/mock-globals
+      - name: Check Git Status
+        if: matrix && matrix.platform.os != 'windows-latest'
+        run: node scripts/git-dirty.js

.github/workflows/ci.yml

@@ -10,6 +10,7 @@ on:
       - smoke-tests/**
       - mock-registry/**
       - workspaces/**
+      - mock-globals/**
   push:
     branches:
       - main
@@ -19,6 +20,7 @@ on:
       - smoke-tests/**
       - mock-registry/**
       - workspaces/**
+      - mock-globals/**
   schedule:
     # "At 09:00 UTC (02:00 PT) on Monday" https://crontab.guru/#0_9_*_*_1
     - cron: "0 9 * * 1"

.gitignore

@@ -56,3 +56,4 @@
 !/workspaces/libnpmsearch/
 !/workspaces/libnpmteam/
 !/workspaces/libnpmversion/
+!/mock-globals/

DEPENDENCIES.md

@@ -120,6 +120,7 @@ graph LR;
   npm-->npmcli-fs["@npmcli/fs"];
   npm-->npmcli-git["@npmcli/git"];
   npm-->npmcli-map-workspaces["@npmcli/map-workspaces"];
+  npm-->npmcli-mock-globals["@npmcli/mock-globals"];
   npm-->npmcli-mock-registry["@npmcli/mock-registry"];
   npm-->npmcli-package-json["@npmcli/package-json"];
   npm-->npmcli-promise-spawn["@npmcli/promise-spawn"];
@@ -186,13 +187,18 @@ graph LR;
   npmcli-arborist-->treeverse;
   npmcli-config-->ini;
   npmcli-config-->nopt;
+  npmcli-config-->npm-registry-fetch;
+  npmcli-config-->npmcli-arborist["@npmcli/arborist"];
   npmcli-config-->npmcli-eslint-config["@npmcli/eslint-config"];
   npmcli-config-->npmcli-map-workspaces["@npmcli/map-workspaces"];
+  npmcli-config-->npmcli-mock-globals["@npmcli/mock-globals"];
+  npmcli-config-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-config-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-config-->proc-log;
   npmcli-config-->read-package-json-fast;
   npmcli-config-->semver;
   npmcli-docs-->ignore-walk;
+  npmcli-docs-->npmcli-config["@npmcli/config"];
   npmcli-docs-->npmcli-eslint-config["@npmcli/eslint-config"];
   npmcli-docs-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-fs-->semver;
@@ -208,6 +214,8 @@ graph LR;
   npmcli-metavuln-calculator-->json-parse-even-better-errors;
   npmcli-metavuln-calculator-->pacote;
   npmcli-metavuln-calculator-->semver;
+  npmcli-mock-globals-->npmcli-eslint-config["@npmcli/eslint-config"];
+  npmcli-mock-globals-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-mock-registry-->npm-package-arg;
   npmcli-mock-registry-->npmcli-arborist["@npmcli/arborist"];
   npmcli-mock-registry-->npmcli-eslint-config["@npmcli/eslint-config"];
@@ -530,6 +538,7 @@ graph LR;
   npm-->npmcli-fs["@npmcli/fs"];
   npm-->npmcli-git["@npmcli/git"];
   npm-->npmcli-map-workspaces["@npmcli/map-workspaces"];
+  npm-->npmcli-mock-globals["@npmcli/mock-globals"];
   npm-->npmcli-mock-registry["@npmcli/mock-registry"];
   npm-->npmcli-package-json["@npmcli/package-json"];
   npm-->npmcli-promise-spawn["@npmcli/promise-spawn"];
@@ -621,22 +630,30 @@ graph LR;
   npmcli-arborist-->tcompare;
   npmcli-arborist-->treeverse;
   npmcli-arborist-->walk-up-path;
+  npmcli-config-->ci-info;
   npmcli-config-->ini;
+  npmcli-config-->isaacs-string-locale-compare["@isaacs/string-locale-compare"];
   npmcli-config-->nopt;
+  npmcli-config-->npm-registry-fetch;
+  npmcli-config-->npmcli-arborist["@npmcli/arborist"];
   npmcli-config-->npmcli-eslint-config["@npmcli/eslint-config"];
   npmcli-config-->npmcli-map-workspaces["@npmcli/map-workspaces"];
+  npmcli-config-->npmcli-mock-globals["@npmcli/mock-globals"];
+  npmcli-config-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-config-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-config-->proc-log;
   npmcli-config-->read-package-json-fast;
   npmcli-config-->semver;
   npmcli-config-->tap;
   npmcli-config-->walk-up-path;
+  npmcli-config-->which;
   npmcli-disparity-colors-->ansi-styles;
   npmcli-docs-->front-matter;
   npmcli-docs-->ignore-walk;
   npmcli-docs-->isaacs-string-locale-compare["@isaacs/string-locale-compare"];
   npmcli-docs-->jsdom;
   npmcli-docs-->mkdirp;
+  npmcli-docs-->npmcli-config["@npmcli/config"];
   npmcli-docs-->npmcli-eslint-config["@npmcli/eslint-config"];
   npmcli-docs-->npmcli-template-oss["@npmcli/template-oss"];
   npmcli-docs-->rehype-stringify;
@@ -667,6 +684,9 @@ graph LR;
   npmcli-metavuln-calculator-->json-parse-even-better-errors;
   npmcli-metavuln-calculator-->pacote;
   npmcli-metavuln-calculator-->semver;
+  npmcli-mock-globals-->npmcli-eslint-config["@npmcli/eslint-config"];
+  npmcli-mock-globals-->npmcli-template-oss["@npmcli/template-oss"];
+  npmcli-mock-globals-->tap;
   npmcli-mock-registry-->nock;
   npmcli-mock-registry-->npm-package-arg;
   npmcli-mock-registry-->npmcli-arborist["@npmcli/arborist"];
@@ -777,13 +797,13 @@ Each group depends on packages lower down the chain, nothing depends on
 packages higher up the chain.
 
  - npm
- - @npmcli/smoke-tests, libnpmaccess, libnpmexec, libnpmpublish
- - @npmcli/mock-registry, libnpmdiff, libnpmfund, libnpmpack
+ - @npmcli/docs, @npmcli/smoke-tests, libnpmaccess, libnpmexec, libnpmpublish
+ - @npmcli/config, @npmcli/mock-registry, libnpmdiff, libnpmfund, libnpmpack
  - @npmcli/arborist
  - @npmcli/metavuln-calculator
  - pacote, libnpmhook, libnpmorg, libnpmsearch, libnpmteam, npm-profile
  - npm-registry-fetch, libnpmversion
- - @npmcli/git, make-fetch-happen, @npmcli/config, init-package-json
+ - @npmcli/git, make-fetch-happen, init-package-json
  - @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, npm-pick-manifest, @npmcli/run-script, read-package-json, promzard
- - @npmcli/docs, @npmcli/fs, npm-bundled, read-package-json-fast, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, read
- - @npmcli/eslint-config, @npmcli/template-oss, ignore-walk, semver, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, treeverse, minify-registry-metadata, ini, @npmcli/disparity-colors, mute-stream, npm-audit-report, npm-user-validate
+ - @npmcli/fs, npm-bundled, read-package-json-fast, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, @npmcli/mock-globals, read
+ - semver, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, ignore-walk, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, treeverse, @npmcli/eslint-config, @npmcli/template-oss, minify-registry-metadata, ini, @npmcli/disparity-colors, mute-stream, npm-audit-report, npm-user-validate

bin/npx-cli.js

@@ -24,11 +24,8 @@ const removed = new Set([
   ...removedOpts,
 ])
 
-const { definitions, shorthands } = require('../lib/utils/config/index.js')
-const npmSwitches = Object.entries(definitions)
-  .filter(([key, { type }]) => type === Boolean ||
-    (Array.isArray(type) && type.includes(Boolean)))
-  .map(([key]) => key)
+const { definitions, shorthands, definitionKeys } = require('@npmcli/config')
+const npmSwitches = definitionKeys.filter(k => definitions[k].hasNonBoolean)
 
 // things that don't take a value
 const switches = new Set([

docs/lib/index.js

@@ -3,7 +3,7 @@ const { join, basename, resolve } = require('path')
 const transformHTML = require('./transform-html.js')
 const { version } = require('../../lib/npm.js')
 const { aliases } = require('../../lib/utils/cmd-list')
-const { shorthands, definitions } = require('../../lib/utils/config/index.js')
+const { shorthands, definitions } = require('@npmcli/config')
 
 const DOC_EXT = '.md'
 

docs/package.json

@@ -21,6 +21,7 @@
   },
   "devDependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
+    "@npmcli/config": "^6.1.0",
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/template-oss": "4.11.0",
     "front-matter": "^4.0.2",

index.js

@@ -1,5 +1,5 @@
 if (require.main === module) {
-  require('./lib/cli.js')(process)
+  require('./lib/cli/validate-engines.js')(process)
 } else {
   throw new Error('The programmatic API was removed in npm v8.0.0')
 }