Merge pull request #219 from ut-code/next-license-list

migrate to next-license-list

Author: na-trium-144

app/about/license/ThirdPartyLicenses.tsx

@@ -1,18 +1,9 @@
 "use client";
 
 import { FallbackPre } from "@/markdown/styledSyntaxHighlighter";
+import { LicenseEntry } from "next-license-list";
 import { useState } from "react";
 
-export interface LicenseEntry {
-  name: string;
-  version: string;
-  author?: string;
-  repository?: string;
-  source?: string;
-  license: string;
-  licenseText?: string;
-}
-
 export function ThirdPartyLicenses({ licenses }: { licenses: LicenseEntry[] }) {
   const [expanded, setExpanded] = useState<string | null>(null);
 
@@ -21,30 +12,6 @@ export function ThirdPartyLicenses({ licenses }: { licenses: LicenseEntry[] }) {
       {licenses.map((pkg) => {
         const key = `${pkg.name}@${pkg.version}`;
         const isOpen = expanded === key;
-        let repositoryURL: string | undefined = undefined;
-        if (pkg.repository?.startsWith("http")) {
-          repositoryURL = pkg.repository;
-        } else if (pkg.repository?.startsWith("git+http")) {
-          repositoryURL = pkg.repository?.slice(4);
-        } else if (pkg.repository?.startsWith("git@")) {
-          repositoryURL =
-            "https://" +
-            pkg.repository
-              .slice(4)
-              .replace(":", "/")
-              .replace(/\.git$/, "");
-        } else if (
-          pkg.repository &&
-          /github:[\w-]+\/[\w-]+/.test(pkg.repository)
-        ) {
-          repositoryURL = `https://github.com/${pkg.repository.slice(7)}`;
-        } else if (pkg.repository && /[\w-]+\/[\w-]+/.test(pkg.repository)) {
-          // assume github username/repository
-          repositoryURL = `https://github.com/${pkg.repository}`;
-        } else {
-          // fallback to source url
-          // repositoryURL = pkg.source ?? "";
-        }
         return (
           <div key={key} className="collapse collapse-arrow bg-base-200">
             <input
@@ -66,15 +33,15 @@ export function ThirdPartyLicenses({ licenses }: { licenses: LicenseEntry[] }) {
                   {pkg.author}
                 </p>
               )}
-              {repositoryURL && (
+              {pkg.repository && (
                 <p className="mb-1">
                   <span className="opacity-60">Repository: </span>
                   <a
                     className="link link-info break-all"
-                    href={repositoryURL}
+                    href={pkg.repository}
                     target="_blank"
                   >
-                    {repositoryURL}
+                    {pkg.repository}
                   </a>
                 </p>
               )}

app/about/license/page.tsx

@@ -1,11 +1,9 @@
 import { Metadata } from "next";
 import licenseText from "@/../LICENSE?raw";
-import { LicenseEntry, ThirdPartyLicenses } from "./ThirdPartyLicenses";
-import { isCloudflare } from "@/lib/detectCloudflare";
-import { getCloudflareContext } from "@opennextjs/cloudflare";
-import { readFile } from "node:fs/promises";
-import { join } from "node:path";
+import { ThirdPartyLicenses } from "./ThirdPartyLicenses";
 import { StyledMarkdown } from "@/markdown/markdown";
+import { getLicenses, LicenseEntry } from "next-license-list";
+import { headers } from "next/headers";
 
 export const metadata: Metadata = {
   title: "ライセンス",
@@ -30,26 +28,8 @@ my.code(); は以下のオープンソースライブラリを使用していま
 `;
 
 export default async function LicensePage() {
-  let licenses: LicenseEntry[];
-  if (isCloudflare()) {
-    const cfAssets = getCloudflareContext().env.ASSETS;
-    const res = await cfAssets!.fetch(
-      `https://assets.local/_next/static/oss-licenses.json`
-    );
-    licenses = await res.json();
-  } else {
-    licenses = JSON.parse(
-      await readFile(
-        join(
-          process.cwd(),
-          process.env.NODE_ENV === "development"
-            ? ".next/dev/static/oss-licenses.json"
-            : ".next/static/oss-licenses.json"
-        ),
-        "utf-8"
-      )
-    );
-  }
+  await headers();
+  const licenses: LicenseEntry[] = await getLicenses();
 
   return (
     <div className="p-4 pb-16 w-full max-w-docs mx-auto">

next.config.ts

@@ -2,13 +2,13 @@ import type { NextConfig } from "next";
 import { initOpenNextCloudflareForDev } from "@opennextjs/cloudflare";
 import { PyodidePlugin } from "@pyodide/webpack-plugin";
 import { version as pyodideVersion } from "pyodide/package.json";
-import LicensePlugin from "webpack-license-plugin";
 import { dirname } from "node:path";
 import { withSentryConfig } from "@sentry/nextjs";
+import { withLicense } from "next-license-list/config";
 
 initOpenNextCloudflareForDev();
 
-const nextConfig: NextConfig = {
+let nextConfig: NextConfig = {
   /* config options here */
   output: "standalone",
   experimental: {
@@ -59,7 +59,7 @@ const nextConfig: NextConfig = {
       },
     ];
   },
-  webpack: (config, { isServer }) => {
+  webpack: (config) => {
     config.plugins.push(
       new PyodidePlugin({
         // public/ 以下に書き出すと404
@@ -85,28 +85,6 @@ const nextConfig: NextConfig = {
       resourceQuery: /raw/,
       type: "asset/source",
     });
-    // クライアントビルドのみサードパーティライセンスを /_next/static/oss-licenses.json に出力
-    if (!isServer) {
-      config.plugins.push(
-        new LicensePlugin({
-          outputFilename: "static/oss-licenses.json",
-          includeNoticeText: true,
-          excludedPackageTest: (packageName /*, version*/) => {
-            return (
-              packageName.startsWith("@my-code") || packageName === "my-code"
-            );
-          },
-          licenseOverrides: {
-            "@better-auth/core@1.4.20": "MIT",
-            "@better-fetch/fetch@1.1.21": "MIT",
-          },
-          includePackages: () =>
-            ["tailwindcss", "daisyui", "@fontsource/m-plus-rounded-1c"].map(
-              (pkg) => dirname(import.meta.resolve(`${pkg}/package.json`))
-            ),
-        })
-      );
-    }
     return config;
   },
   async redirects() {
@@ -183,7 +161,21 @@ const nextConfig: NextConfig = {
   },
 };
 
-export default withSentryConfig(nextConfig, {
+nextConfig = withLicense(nextConfig, {
+  includeNoticeText: true,
+  excludedPackageTest: (packageName /*, version*/) => {
+    return packageName.startsWith("@my-code") || packageName === "my-code";
+  },
+  licenseOverrides: {
+    "@better-auth/core@1.4.20": "MIT",
+    "@better-fetch/fetch@1.1.21": "MIT",
+  },
+  includePackages: () =>
+    ["tailwindcss", "daisyui", "@fontsource/m-plus-rounded-1c"].map((pkg) =>
+      dirname(import.meta.resolve(`${pkg}/package.json`))
+    ),
+});
+nextConfig = withSentryConfig(nextConfig, {
   org: process.env.SENTRY_ORG,
   project: process.env.SENTRY_PROJECT,
   sentryUrl: process.env.SENTRY_URL,
@@ -210,3 +202,5 @@ export default withSentryConfig(nextConfig, {
     excludeReplayWorker: true,
   },
 });
+
+export default nextConfig;