Skip to content
Open
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ exports[`json 1`] = `
"identifier": "MIT",
"text": "MIT License\\n\\nCopyright (c) ..."
},
{
"name": "@vitejs/test-dep-license-type-marker",
"version": "1.0.0",
"identifier": "MIT",
"text": "MIT License\\n\\nCopyright (c) ..."
},
{
"name": "@vitejs/test-dep-nested-license-isc",
"version": "0.0.0",
Expand All @@ -40,6 +46,12 @@ MIT License

Copyright (c) ...

## @vitejs/test-dep-license-type-marker - 1.0.0 (MIT)

MIT License

Copyright (c) ...

## @vitejs/test-dep-nested-license-isc - 0.0.0 (ISC)

Copyright (c) ...
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// Avoid to be inlined completely: https://github.com/rolldown/rolldown/issues/8100
console.log()

export default 'ok'
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "@vitejs/test-dep-license-type-marker",
"type": "module"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
MIT License

Copyright (c) ...
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"name": "@vitejs/test-dep-license-type-marker",
"private": true,
"version": "1.0.0",
"license": "MIT",
"exports": {
".": "./build/esm/index.js"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script type="module">
import dep1 from '@vitejs/test-dep-licence-cc0'
import dep2 from '@vitejs/test-dep-license-mit'
console.log(dep1, dep2)
import dep3 from '@vitejs/test-dep-license-type-marker'
console.log(dep1, dep2, dep3)
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"type": "module",
"dependencies": {
"@vitejs/test-dep-license-mit": "file:./dep-license-mit",
"@vitejs/test-dep-license-type-marker": "file:./dep-license-type-marker",
"@vitejs/test-dep-licence-cc0": "file:./dep-licence-cc0"
}
}
21 changes: 18 additions & 3 deletions packages/vite/src/node/plugins/license.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from 'node:fs'
import path from 'node:path'
import type { PackageCache } from '../packages'
import { findNearestMainPackageData } from '../packages'
import type { PackageCache, PackageData } from '../packages'
import { findNearestPackageData } from '../packages'
import type { Plugin } from '../plugin'
import { isInNodeModules, sortObjectKeys } from '../utils'

Expand Down Expand Up @@ -41,6 +41,21 @@ const licenseConfigDefaults = Object.freeze({
// https://github.com/npm/npm-packlist/blob/53b2a4f42b7fef0f63e8f26a3ea4692e23a58fed/lib/index.js#L284-L286
const licenseFiles = [/^license/i, /^licence/i, /^copying/i]

// Unlike `findNearestMainPackageData`, a manifest is only accepted when it has both a `name` and a `version`. Dual ESM/CJS packages ship type-marker
// package.json files (e.g. `build/esm/package.json`) that carry a `name` but no `version` or license information, so the walk must continue up to the real package root to produce a complete license entry.
function findLicensePackageData(
basedir: string,
packageCache: PackageCache,
): PackageData | null {
let pkgData = findNearestPackageData(basedir, packageCache)
while (pkgData && !(pkgData.data.name && pkgData.data.version)) {
const parentDir = path.dirname(pkgData.dir)
if (parentDir === pkgData.dir) return null
pkgData = findNearestPackageData(parentDir, packageCache)
}
return pkgData
}

export function licensePlugin(): Plugin {
return {
name: 'vite:license',
Expand All @@ -62,7 +77,7 @@ export function licensePlugin(): Plugin {
if (moduleId.startsWith('\0') || !isInNodeModules(moduleId)) continue

// Find the dependency package.json
const pkgData = findNearestMainPackageData(
const pkgData = findLicensePackageData(
path.dirname(moduleId),
packageCache,
)
Expand Down
12 changes: 12 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.