Unverified Commit 26348fc2 authored by Hong Minhee's avatar Hong Minhee
Browse files

Bundle @std/semver

parent e3cf8b30

cli/deno.json

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
    "@jimp/wasm-webp": "npm:@jimp/wasm-webp@^1.6.0",

    "@poppanator/http-constants": "npm:@poppanator/http-constants@^1.1.1",

    "@std/dotenv": "jsr:@std/dotenv@^0.225.2",

    "@std/semver": "jsr:@std/semver@^1.0.5",

    "cli-highlight": "npm:cli-highlight@^2.1.11",

    "hono": "jsr:@hono/hono@^4.5.9",

    "icojs": "npm:icojs@^0.19.4",

deno.json

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
    "@multiformats/base-x": "npm:@multiformats/base-x@^4.0.1",

    "@std/fs": "jsr:@std/fs@^1.0.3",

    "@std/path": "jsr:@std/path@^1.0.6",

    "@std/semver": "jsr:@std/semver@^1.0.3",

    "preact": "npm:preact@10.19.6"

  },

  "unstable": [

examples/blog/federation/mod.ts

+2 −2
Original line number Diff line number Diff line 
import { parse } from "@std/semver";

import { dirname, join } from "@std/path";

import { createFederation } from "@fedify/fedify/federation";

import {
@@ -15,6 +14,7 @@ import { 
  Person,

  Undo,

} from "@fedify/fedify/vocab";

import { parseSemVer } from "@fedify/fedify/nodeinfo";

import { DenoKvMessageQueue, DenoKvStore } from "@fedify/fedify/x/denokv";

import { getBlog } from "../models/blog.ts";

import { addComment, Comment, getComments } from "../models/comment.ts";
@@ -322,7 +322,7 @@ federation.setNodeInfoDispatcher("/nodeinfo/2.1", async (_ctx) => { 
  return {

    software: {

      name: "fedify-example-blog",

      version: parse(denoJson.version),

      version: parseSemVer(denoJson.version),

      repository: new URL(

        "https://github.com/fedify-dev/fedify/tree/main/examples/blog",

      ),

fedify/federation/builder.test.ts

+2 −2
Original line number Diff line number Diff line 
import { assertEquals, assertExists } from "@std/assert";

import { parse } from "@std/semver";

import { parseSemVer } from "../nodeinfo/semver.ts";

import type { Protocol } from "../nodeinfo/types.ts";

import { test } from "../testing/mod.ts";

import { Activity, Note, Person } from "../vocab/vocab.ts";
@@ -46,7 +46,7 @@ test("FederationBuilder", async (t) => { 
        version: "2.1",

        software: {

          name: "test",

          version: parse("1.0.0"),

          version: parseSemVer("1.0.0"),

        },

        protocols: ["activitypub"] as Protocol[],

        services: { inbound: [], outbound: [] },

fedify/nodeinfo/client.ts

+2 −2
Original line number Diff line number Diff line 
import { getLogger } from "@logtape/logtape";

import { parse, type SemVer } from "@std/semver";

import {

  getUserAgent,

  type GetUserAgentOptions,

} from "../runtime/docloader.ts";

import type { ResourceDescriptor } from "../webfinger/jrd.ts";

import { parseSemVer, type SemVer } from "./semver.ts";

import type {

  InboundService,

  JsonValue,
@@ -268,7 +268,7 @@ export function parseSoftware( 
  let version: SemVer;

  if ("version" in data && typeof data.version === "string") {

    try {

      version = parse(data.version);

      version = parseSemVer(data.version);

    } catch {

      if (!options.tryBestEffort) return null;

      version = { major: 0, minor: 0, patch: 0, build: [], prerelease: [] };