Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@
* [`ccd8420`](https://github.com/npm/cli/commit/ccd84201e4e369992289842a5117cb3b531a7a36) [#7911](https://github.com/npm/cli/pull/7911) fix cli tests for audit fallback removal (@wraithgar)
* [`720b4d8`](https://github.com/npm/cli/commit/720b4d807bd2e214a045a9ffa9c56435823a7a05) [#7833](https://github.com/npm/cli/pull/7833) bump @npmcli/arborist to 8.0.0 (@wraithgar)
* [`286739c`](https://github.com/npm/cli/commit/286739c0224bad88c4a38927bafd61973f71098c) [#7824](https://github.com/npm/cli/pull/7824) add creation of a DEPENDENCIES.json file (#7824) (@reggi)
* [`852dd8b`](https://github.com/npm/cli/commit/852dd8bdcb958439d343bcd9fb27fb4f07e95991) [#7831](https://github.com/npm/cli/pull/7831) sets npm 11 to prerelase (@reggi)
* [`852dd8b`](https://github.com/npm/cli/commit/852dd8bdcb958439d343bcd9fb27fb4f07e95991) [#7831](https://github.com/npm/cli/pull/7831) sets npm 11 to prerelease (@reggi)
* [`95d009e`](https://github.com/npm/cli/commit/95d009e606b187b9e148f4f1119b8a19e5beb7f0) [#7831](https://github.com/npm/cli/pull/7831) update engine `^20.17.0 || >=22.9.0` in actions (@reggi)
* [`5a74478`](https://github.com/npm/cli/commit/5a744782af53d6655669e49d911468934ea5e027) [#7831](https://github.com/npm/cli/pull/7831) update engines `^20.17.0 || >=22.9.0` in package template (@reggi)
* [workspace](https://github.com/npm/cli/releases/tag/arborist-v9.0.0-pre.0): `@npmcli/arborist@9.0.0-pre.0`
Expand Down
4 changes: 2 additions & 2 deletions mock-globals/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class DescriptorStack {
return () => {
const index = this.#stack.indexOf(nextDescriptor)
// If the stack doesnt contain the descriptor anymore
// than do nothing. This keeps the reset function indempotent
// than do nothing. This keeps the reset function idempotent
if (index > -1) {
// Resetting removes a descriptor from the stack
this.#stack.splice(index, 1)
Expand Down Expand Up @@ -174,7 +174,7 @@ class MockGlobals {
#descriptors = {}

register (globals, { replace = false } = {}) {
// Replace means dont merge in object values but replace them instead
// Replace means don't merge in object values but replace them instead
// so we only get top level keys instead of walking the obj
const keys = replace ? Object.keys(globals) : getKeys(globals)

Expand Down
6 changes: 3 additions & 3 deletions mock-globals/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ t.test('multiple mocks and resets', async (t) => {
t.equal(process.platform, nextPlatform, 'first reset')
reset()
reset()
t.equal(process.platform, nextPlatform, 'multiple resets are indempotent')
t.equal(process.platform, nextPlatform, 'multiple resets are idempotent')
})
})

Expand All @@ -294,10 +294,10 @@ t.test('multiple mocks and resets', async (t) => {
const nextPlatform = index === platforms.length - 1 ? initial : lastPlatform
t.equal(process.platform, lastPlatform)
reset()
t.equal(process.platform, nextPlatform, 'multiple resets are indempotent')
t.equal(process.platform, nextPlatform, 'multiple resets are idempotent')
reset()
reset()
t.equal(process.platform, nextPlatform, 'multiple resets are indempotent')
t.equal(process.platform, nextPlatform, 'multiple resets are idempotent')
})
})

Expand Down
2 changes: 1 addition & 1 deletion mock-registry/lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ class MockRegistry {
}

/**
* this is a simpler convience method for creating mockable registry with
* this is a simpler convenience method for creating mockable registry with
* tarballs for specific versions
*/
async setup (packages) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/bundle-and-gitignore-deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const main = async () => {
// Get all files within node_modules and remove the node_modules/ portion of
// the path for processing since this list will go inside a gitignore at the
// root of the node_modules dir. It also removes workspaces since those are
// symlinks and should not be commited into source control.
// symlinks and should not be committed into source control.
const files = allFiles
.filter(f => f.startsWith('node_modules/'))
.map(f => f.replace(/^node_modules\//, ''))
Expand Down
4 changes: 2 additions & 2 deletions scripts/create-node-pr.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ const getPrBody = async ({ releases, closePrs }) => {
.use(remarkGfm)
.use(remarkGithub, {
repository: 'npm/cli',
// dont link mentions, but anything else make the link an explicit referance to npm/cli
// don't link mentions, but anything else make the link an explicit reference to npm/cli
buildUrl: (values) => values.type === 'mention' ? false : defaultBuildUrl(values),
})
.process(prBody)
Expand Down Expand Up @@ -197,7 +197,7 @@ const main = async (spec, branch = 'main', opts) => withTempDir(CWD, async (tmpD
// get a list of all versions changelogs to add to the body of the PR
// do this before we checkout our branch and make any changes
const npmReleases = await Promise.all(newNpmVersions.map(async (v) => {
// dont include prereleases unless we are updating to a prerlease since we
// don't include prereleases unless we are updating to a prerelease since we
// manually put all prerelease notes into the first stable major version
if (v.prerelease.length && !npmVersion.prerelease.length) {
return null
Expand Down
2 changes: 1 addition & 1 deletion scripts/publish.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ const main = async (opts) => {

if (smokePublish) {
// when we have a smoke test run we'd want to bump the version or else npm will throw an error even with dry-run
// this is the equivlent of running `npm version prerelease`, but ensureing all internally used workflows are bumped
// this is the equivalent of running `npm version prerelease`, but ensuring all internally used workflows are bumped
for (const publish of publishes) {
const { version } = await publish.updatePkg((pkg) => ({ ...pkg, version: `${pkg.version}-smoke.0` }))
for (const ipublish of publishes) {
Expand Down
2 changes: 1 addition & 1 deletion scripts/template-oss/branch-specific-config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Leave this empty to use the default ciVersions from template-oss
// This file is kept here to make it easier to apply template-oss
// changes to other branches which might have different ciVersions
// or other conifg options
// or other config options
module.exports = {}
2 changes: 1 addition & 1 deletion test/lib/cli/exit-handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const mockExitHandler = async (t, {
...errors,
],
npm,
// Make it async to make testing ergonomics a little easier so we dont need
// Make it async to make testing ergonomics a little easier so we don't need
// to t.plan() every test to make sure we get process.exit called.
exitHandler: (argErr) => new Promise(res => {
process.once('exit', res)
Expand Down
2 changes: 1 addition & 1 deletion test/lib/load-all-commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ t.test('load each command', async t => {
})
}

// make sure refactors dont move or rename these static properties since
// make sure refactors don't move or rename these static properties since
// we guard against the tests for them above
t.ok(counts.completion > 0, 'has some completion functions')
t.ok(counts.ignoreImplicitWorkspace > 0, 'has some commands that change ignoreImplicitWorkspace')
Expand Down
2 changes: 1 addition & 1 deletion test/lib/utils/reify-output.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const mockReify = async (t, reify, { command, ...config } = {}) => {
// Hack to adapt existing fake test. Make npm.command
// return whatever was passed in to this function.
// What it should be doing is npm.exec(command) but that
// breaks most of these tests because they dont expect
// breaks most of these tests because they don't expect
// a command to actually run.
Object.defineProperty(mock.npm, 'command', {
get () {
Expand Down
Loading