Skip to content

Commit

Permalink
Improve handling of non-semver ranges (#30)
Browse files Browse the repository at this point in the history
* Move private spec

* Handle non-semver ranges

* remove import
  • Loading branch information
mskelton authored Aug 30, 2021
1 parent 95136ea commit 068de2c
Show file tree
Hide file tree
Showing 8 changed files with 92 additions and 41 deletions.
6 changes: 3 additions & 3 deletions bundles/@yarnpkg/plugin-outdated.js

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions src/OutdatedCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import {
Configuration,
Descriptor,
FormatType,
formatUtils,
Ident,
Locator,
formatUtils, Locator,
MessageName,
Project,
Report,
StreamReport,
structUtils,
Workspace,
Workspace
} from "@yarnpkg/core"
import { Command, Option, Usage, UsageError } from "clipanion"
import * as micromatch from "micromatch"
Expand Down Expand Up @@ -204,7 +202,7 @@ export class OutdatedCommand extends BaseCommand {

dependencies.push({
dependencyType,
name: structUtils.stringifyIdent(pkg as Ident),
name: structUtils.stringifyIdent(descriptor),
pkg,
workspace,
})
Expand Down
38 changes: 38 additions & 0 deletions test/lockfiles/non-semver.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# This file is generated by running "yarn install" inside your project.
# Manual changes might be lost - proceed with caution!

__metadata:
version: 4
cacheKey: 0

"alias@npm:patch@1.0.0, patch@npm:latest":
version: 1.0.0
resolution: "patch@npm:1.0.0"
checksum: c01c6b0c9b86548dbee97f6fb2153044ddebc97f48e0233302d47e1425b0f626e7cb59a51cf0c89563bc50f0bc1124d23d8e61bd5415d2a9025f23650bedffc7
languageName: node
linkType: hard

"major@npm:*":
version: 1.0.0
resolution: "major@npm:1.0.0"
checksum: 1d6bda91b0cfdf6d5ca9c167a0daa2f6fb859b434ecb6e95155fcbe051c3ff5d44489592767117e7818ae24799c90aac710fa4bde0d2e83e816170d2695bfcea
languageName: node
linkType: hard

"minor@npm:>1.0.0 <2.0.0":
version: 1.0.0
resolution: "minor@npm:1.0.0"
checksum: 38465fcac78151415aa8d5bcc7572678fb6bc14477ef1e3b659cba9a1f4e886c19509336ad21b35d18b430477a19e3e57b3d46cd3a46b7465117da435f32ef6a
languageName: node
linkType: hard

"foo@workspace:.":
version: 0.0.0-use.local
resolution: "foo@workspace:."
dependencies:
alias: "npm:patch@1.0.0"
major: "*"
minor: ">1.0.0 <2.0.0"
patch: latest
languageName: unknown
linkType: soft
20 changes: 20 additions & 0 deletions test/specs/all.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,24 @@ test.describe("yarn outdated --all", () => {
expect(stdout).toMatchSnapshot("computed-workspace-name.txt")
expect(stderr).toBe("")
})

test("skips private packages", async ({ env }) => {
const { run, writeJSON } = env

await writeJSON("package.json", { workspaces: ["packages/*"] })
await writeJSON("packages/a/package.json", {
name: "a",
private: true,
version: "1.1.0",
})
await writeJSON("packages/b/package.json", {
dependencies: { a: "1.1.0", patch: "1.0.0" },
name: "b",
})
await run("install")

const { stderr, stdout } = await run("outdated --all")
expect(stdout).toMatchSnapshot("private.txt")
expect(stderr).toBe("")
})
})
47 changes: 15 additions & 32 deletions test/specs/outdated.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { expect, test } from "../fixtures/env"
import { readLockfile } from "../utils/lockfile"

test.describe("yarn outdated", () => {
test("shows outdated dependencies", async ({ env }) => {
Expand Down Expand Up @@ -29,24 +30,6 @@ test.describe("yarn outdated", () => {
expect(stderr).toBe("")
})

test("ignores non-semver ranges", async ({ env }) => {
const { run, writeJSON } = env

await writeJSON("package.json", {
dependencies: {
// TODO: Add tests for all non-semver ranges
// major: "workspace:^1.2.3",
minor: "latest",
patch: "1.0.0",
},
})
await run("install")

const { stderr, stdout } = await run("outdated")
expect(stdout).toMatchSnapshot("non-semver.txt")
expect(stderr).toBe("")
})

test("formats scoped dependencies", async ({ env }) => {
const { run, writeJSON } = env

Expand Down Expand Up @@ -109,23 +92,23 @@ test.describe("yarn outdated", () => {
expect(stderr).toBe("")
})

test("skips private packages", async ({ env }) => {
const { run, writeJSON } = env
test("handles non-semver ranges", async ({ env }) => {
const { run, writeFile, writeJSON } = env

await writeJSON("package.json", { workspaces: ["packages/*"] })
await writeJSON("packages/a/package.json", {
name: "a",
private: true,
version: "1.1.0",
})
await writeJSON("packages/b/package.json", {
dependencies: { a: "1.1.0", patch: "1.0.0" },
name: "b",
await writeJSON("package.json", {
dependencies: {
alias: "npm:patch@1.0.0",
major: "*",
minor: ">1.0.0 <2.0.0",
patch: "latest",
},
name: "foo",
})
await run("install")
await writeFile("yarn.lock", readLockfile("non-semver.lock"))
await run("install --immutable")

const { stderr, stdout } = await run("outdated --all")
expect(stdout).toMatchSnapshot("private.txt")
const { stderr, stdout } = await run("outdated")
expect(stdout).toMatchSnapshot("non-semver.txt")
expect(stderr).toBe("")
})
})
5 changes: 4 additions & 1 deletion test/specs/outdated.spec.ts-snapshots/non-semver.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
➤ YN0000: └ Completed

➤ YN0000: Package Current Latest Package Type
➤ YN0000: alias 1.0.0 1.0.1 dependencies
➤ YN0000: major 1.0.0 2.0.0 dependencies
➤ YN0000: minor 1.0.0 1.1.0 dependencies
➤ YN0000: patch 1.0.0 1.0.1 dependencies

➤ YN0000: 1 dependency is out of date
➤ YN0000: 4 dependencies are out of date
➤ YN0000: Done with warnings
9 changes: 9 additions & 0 deletions test/utils/lockfile.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import fs from "fs"
import path from "path"

export function readLockfile(filename: string) {
return fs.readFileSync(
path.join(__dirname, "..", "lockfiles", filename),
"utf8"
)
}

0 comments on commit 068de2c

Please sign in to comment.