Merge remote-tracking branch 'origin/main' into antfu/migrate-devframe-hub-0.5.2

# Conflicts:
#	packages/core/src/client/webcomponents/.generated/css.ts
#	pnpm-lock.yaml
#	pnpm-workspace.yaml

Author: antfu

packages/core/src/client/webcomponents/.generated/css.ts

@@ -161,10 +161,34 @@ const panelStyle = computed<CSSProperties>(() => {
   return style
 })
 
+const panelLayoutClass = computed(() => {
+  switch (store.position) {
+    case 'bottom':
+      return 'flex flex-col-reverse'
+    case 'top':
+      return 'flex flex-col'
+    case 'left':
+      return 'flex flex-row'
+    case 'right':
+      return 'flex flex-row-reverse'
+    default:
+      return 'flex flex-col-reverse'
+  }
+})
+
 const toolbarClass = computed(() => {
-  return isVertical.value
-    ? 'flex-col h-full w-[40px] border-r border-base'
-    : 'flex-row w-full border-b border-base'
+  switch (store.position) {
+    case 'bottom':
+      return 'flex-row w-full border-t border-base'
+    case 'top':
+      return 'flex-row w-full border-b border-base'
+    case 'left':
+      return 'flex-col h-full w-[40px] border-r border-base'
+    case 'right':
+      return 'flex-col h-full w-[40px] border-l border-base'
+    default:
+      return 'flex-row w-full border-t border-base'
+  }
 })
 
 const contentClass = computed(() => {
@@ -178,7 +202,7 @@ const contentClass = computed(() => {
   <div
     id="vite-devtools-edge-panel"
     class="bg-glass:75 border border-base color-base shadow overflow-hidden z-floating-anchor font-sans text-[15px] box-border"
-    :class="`flex ${isVertical ? 'flex-row' : 'flex-col'}`"
+    :class="panelLayoutClass"
     :style="panelStyle"
   >
     <DockPanelResizer v-if="hasPanelContent" :panel="context.panel" edge-mode />

packages/core/src/client/webcomponents/components/dock/DockEdge.vue

@@ -35,7 +35,6 @@
   },
   "dependencies": {
     "@floating-ui/dom": "catalog:frontend",
-    "@pnpm/read-project-manifest": "catalog:deps",
     "@rolldown/debug": "catalog:deps",
     "@vitejs/devtools-kit": "workspace:*",
     "birpc": "catalog:deps",
@@ -78,45 +77,5 @@
     "tsdown": "catalog:build",
     "unocss": "catalog:build",
     "vite-hot-client": "catalog:frontend"
-  },
-  "inlinedDependencies": {
-    "@babel/code-frame": "7.29.0",
-    "@babel/helper-validator-identifier": "7.28.5",
-    "@gwhitney/detect-indent": "7.0.1",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/core-loggers": "1001.0.9",
-    "@pnpm/error": "1000.1.0",
-    "@pnpm/graceful-fs": "1000.1.0",
-    "@pnpm/logger": "1001.0.1",
-    "@pnpm/manifest-utils": "1002.0.5",
-    "@pnpm/read-project-manifest": "1001.2.6",
-    "@pnpm/semver.peer-range": "1000.0.0",
-    "@pnpm/text.comments-parser": "1000.0.0",
-    "@pnpm/types": "1001.3.0",
-    "@pnpm/write-project-manifest": "1000.0.16",
-    "bole": "5.0.25",
-    "error-ex": "1.3.4",
-    "fast-deep-equal": "3.1.3",
-    "fast-safe-stringify": "2.1.1",
-    "graceful-fs": "4.2.11",
-    "imurmurhash": "0.1.4",
-    "individual": "3.0.0",
-    "is-arrayish": "0.2.1",
-    "is-windows": "1.0.2",
-    "js-tokens": "4.0.0",
-    "js-yaml": "4.1.1",
-    "json-parse-even-better-errors": "2.3.1",
-    "json5": "2.2.3",
-    "lines-and-columns": "1.2.4",
-    "parse-json": "5.2.0",
-    "picocolors": "1.1.1",
-    "read-yaml-file": "2.1.0",
-    "semver": "7.8.0",
-    "signal-exit": "4.1.0",
-    "split2": "4.2.0",
-    "strip-bom": "4.0.0",
-    "strip-comments-strings": "1.2.0",
-    "write-file-atomic": "5.0.1",
-    "write-yaml-file": "5.0.0"
   }
 }

packages/rolldown/package.json

@@ -13,11 +13,6 @@ const props = defineProps<{
 const emit = defineEmits<{
   (e: 'close'): void
 }>()
-const parsedPackage = computed(() => {
-  const match = props.package.match(/^(@?[^@]+)@(.+)$/)
-  const [, name, version] = match!
-  return { name, version }
-})
 const rpc = useRpc()
 const { state, isLoading } = useAsyncState(
   async () => {
@@ -33,6 +28,7 @@ const { state, isLoading } = useAsyncState(
 )
 
 const normalizedBundledFiles = computed(() => state.value?.files?.filter(f => !!f.transformedCodeSize) ?? [])
+const packageName = computed(() => state.value?.name ?? props.package)
 
 const importers = computed(() => {
   const pathMap = new Map()
@@ -43,7 +39,7 @@ const importers = computed(() => {
 })
 
 function openInNpm() {
-  const url = `https://www.npmjs.com/package/${parsedPackage.value.name}`
+  const url = `https://www.npmjs.com/package/${packageName.value}`
   window.open(url, '_blank')
 }
 </script>
@@ -56,7 +52,7 @@ function openInNpm() {
       <div flex="~ gap-3 items-center" :title="package">
         <div flex="~ items-center gap-1">
           <div>
-            <DisplayHighlightedPackageName :name="parsedPackage.name!" />
+            <DisplayHighlightedPackageName :name="packageName" />
           </div>
           <DisplayFileSizeBadge :bytes="state.transformedCodeSize" />
         </div>

packages/rolldown/src/app/components/data/PackageDetailsLoader.vue

@@ -19,7 +19,7 @@ const groupedDuplicatePackages = computed(() =>
 <template>
   <div v-if="duplicatePackages.length" min-w-max flex="~ col gap-3">
     <div v-for="(p, i) of groupedDuplicatePackages" :key="i">
-      <PackagesTable :packages="p" :session="session" group-view disable-size-sort />
+      <PackagesTable :packages="p" :session="session" group-view disable-size-sort show-used-badge />
     </div>
   </div>
   <template v-else>

packages/rolldown/src/app/components/packages/Duplicated.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import type { PackageInfo, SessionContext } from '~~/shared/types'
 import DataVirtualList from '@vitejs/devtools-ui/components/DataVirtualList.vue'
+import DisplayBadge from '@vitejs/devtools-ui/components/DisplayBadge.vue'
 import { useCycleList } from '@vueuse/core'
 import { Tooltip, Menu as VMenu } from 'floating-vue'
 import { settings } from '~~/app/state/settings'
@@ -14,12 +15,14 @@ withDefaults(defineProps<{
   itemSize?: number
   pageMode?: boolean
   scroller?: 'dynamic' | 'fixed' | 'window'
+  showUsedBadge?: boolean
 }>(), {
   disableSizeSort: false,
   groupView: false,
   itemSize: 36,
   pageMode: false,
   scroller: 'fixed',
+  showUsedBadge: false,
 })
 
 const route = useRoute()
@@ -40,7 +43,7 @@ function toggleSizeSortType() {
     role="table"
     min-w-max h-full min-h-0 border="~ base rounded-xl"
     :items="packages"
-    key-prop="dir"
+    key-prop="id"
     :item-size="itemSize"
     :page-mode="pageMode"
     :scroller="scroller"
@@ -81,7 +84,7 @@ function toggleSizeSortType() {
         h-9
         class="border-base border-b-1 border-dashed"
         :class="[index === packages.length - 1 ? 'border-b-0' : '']"
-        :to="{ path: route.path, query: { package: `${item.name}@${item.version}` } }"
+        :to="{ path: route.path, query: { package: item.id } }"
       >
         <Tooltip
           :triggers="['hover']"
@@ -100,11 +103,17 @@ function toggleSizeSortType() {
             </span>
           </template>
         </Tooltip>
-        <div role="cell" flex="~ items-center" text-left flex-none font-mono py1.5 px2 text-sm min-w40 op80 :class="{ 'text-primary': item.duplicated }">
-          {{ item.version }}
+        <div role="cell" flex="~ items-center gap-1" text-left flex-none font-mono py1.5 px2 text-sm min-w40 op80 :class="{ 'text-primary': item.duplicated }">
+          <span>{{ item.version }}</span>
+          <DisplayBadge
+            v-if="showUsedBadge && item.isUsed === false"
+            text="Unbundled"
+            :color="30"
+            as="span"
+          />
         </div>
         <div role="cell" flex="~ items-center justify-end" flex-none font-mono py1.5 px2 text-sm min-w40 op80>
-          <VMenu :delay="{ show: 200, hide: 0 }">
+          <VMenu v-if="item.transformedCodeSize > 0" :delay="{ show: 200, hide: 0 }">
             <DisplayFileSizeBadge :bytes="item.transformedCodeSize" />
             <template #popper>
               <div p2 flex="~ col gap-1">
@@ -117,6 +126,7 @@ function toggleSizeSortType() {
               </div>
             </template>
           </VMenu>
+          <span v-else op50 ws-nowrap>-</span>
         </div>
         <div role="cell" flex="~ items-center" flex-1 font-mono py1.5 pl20 pr2 text-sm op80>
           <PackagesImporters :package="item" :session="session" :show-version="groupView" />

packages/rolldown/src/app/components/packages/Table.vue

@@ -14,7 +14,8 @@ const sessions = ref<SessionCompareContext[]>([])
 const packages = ref<{ total: number, duplicated: number }[]>([])
 
 async function getPackages(id: string) {
-  const packages = await rpc.value.call('vite:rolldown:get-packages', { session: id })
+  const packageMeta = await rpc.value.call('vite:rolldown:get-packages', { session: id })
+  const packages = packageMeta.packages
   const duplicatedPackages = packages.filter(p => p.duplicated)
   return {
     total: packages.length,

packages/rolldown/src/app/pages/compare/[sessions]/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { PackageInfo, SessionContext } from '~~/shared/types/data'
+import type { PackageInfo, PackageMeta, SessionContext } from '~~/shared/types/data'
 import type { ClientSettings } from '~/state/settings'
 import type { PackageChartInfo, PackageChartNode } from '~/types/chart'
 import { computedWithControl, useAsyncState, useMouse } from '@vueuse/core'
@@ -33,13 +33,19 @@ const packageTypeRules = [
     description: 'Transitive Dependencies',
     icon: 'i-octicon:package-24 light:filter-invert-30!',
   },
+  {
+    match: /.*/,
+    name: 'unbundled',
+    description: 'Unbundled Dependencies',
+    icon: 'i-ph-package-duotone',
+  },
 ]
 const rpc = useRpc()
-const searchValue = ref<{ search: string, selected: string[] }>({
+const searchValue = ref<{ search: string, selected: string[] | null }>({
   search: '',
   selected: ['direct', 'transitive'],
 })
-const { state: packages, isLoading } = useAsyncState(
+const { state: packageMeta, isLoading } = useAsyncState<PackageMeta | null>(
   async () => {
     return await rpc.value.call(
       'vite:rolldown:get-packages',
@@ -48,26 +54,43 @@ const { state: packages, isLoading } = useAsyncState(
   },
   null,
 )
+const isSupported = computed(() => packageMeta.value?.isSupported ?? true)
+const packages = computed(() => packageMeta.value?.packages ?? [])
 
 const fuse = computedWithControl(
   () => packages.value,
-  () => new Fuse(packages.value!, {
+  () => new Fuse(packages.value, {
     includeScore: true,
     keys: ['name'],
     ignoreLocation: true,
     threshold: 0.4,
   }),
 )
 
-const duplicatePackagesCount = computed(() => {
-  if (!packages.value) {
-    return 0
-  }
-  return Object.values(packages.value!.reduce((acc, p) => {
-    acc[p.name] = (acc[p.name] || 0) + 1
-    return acc
-  }, {} as Record<string, number>)).filter(count => count > 1).length
-})
+const searched = computed(() => (
+  searchValue.value.search
+    ? fuse.value.search(searchValue.value.search).map(r => r.item)
+    : [...packages.value]),
+)
+
+function matchesSelectedPackageType(item: PackageInfo) {
+  const selected = searchValue.value.selected
+  if (!selected)
+    return true
+
+  if (item.isUsed === false)
+    return selected.includes('unbundled')
+
+  return selected.includes(item.type || '')
+}
+
+const filteredPackages = computed(() => searched.value.filter(matchesSelectedPackageType))
+
+const duplicatePackagesCount = computed(() => new Set(
+  packages.value
+    .filter(item => item.duplicated)
+    .map(item => item.name),
+).size)
 
 const packageViewTypes = computed(() => [
   {
@@ -87,21 +110,15 @@ const packageViewTypes = computed(() => [
   },
 ] as const)
 
-const searched = computed(() => (
-  searchValue.value.search
-    ? fuse.value.search(searchValue.value.search).map(r => r.item)
-    : [...(packages.value || [])]),
-)
-
 const normalizedPackages = computed(() => {
   const packagesSizeSortType = settings.value.packageSizeSortType
-  const data = searched.value.toSorted((a, b) => (a.name || '').localeCompare(b.name || ''))
+  const data = filteredPackages.value.toSorted((a, b) => (a.name || '').localeCompare(b.name || ''))
 
   const sortedPackages = packagesSizeSortType
     ? data.sort((a, b) => packagesSizeSortType === 'asc' ? a.transformedCodeSize - b.transformedCodeSize : b.transformedCodeSize - a.transformedCodeSize)
     : data
 
-  return sortedPackages.filter(item => !searchValue.value.selected || searchValue.value.selected.some(rule => rule.match(item.type!)))
+  return sortedPackages
 })
 
 function toggleDisplay(type: ClientSettings['packageViewType']) {
@@ -123,7 +140,7 @@ const { tree, chartOptions, graph, nodeHover, nodeSelected, selectedNode, select
     },
     onClick(node) {
       if (node.meta?.type === 'package') {
-        router.replace({ query: { ...route.query, package: `${node.meta?.name}@${node.meta?.version}` } })
+        router.replace({ query: { ...route.query, package: node.meta.id } })
       }
     },
     onLeave() {
@@ -151,6 +168,14 @@ watch(() => settings.value.packageViewType, () => {
 
 <template>
   <VisualLoading v-if="isLoading" />
+  <div v-else-if="!isSupported" h-full flex="~ col gap-2 items-center justify-center" p4 text-center>
+    <p m0 op50>
+      Package graph is not available for this build
+    </p>
+    <p m0 op40 text-sm>
+      Rebuild with Rolldown 1.0.2 or later to generate it.
+    </p>
+  </div>
   <div v-else relative h-full min-h-0 flex="~ col">
     <div sticky left-4 right-4 top-4 z-panel-nav p-4>
       <DataSearchPanel v-model="searchValue" :rules="packageTypeRules">
@@ -179,7 +204,7 @@ watch(() => settings.value.packageViewType, () => {
         <div
           fixed bottom-4 py-1 px-2 bg-glass left="1/2" translate-x="-1/2" border="~ base rounded-full" text="center xs"
         >
-          <span op50>{{ searched.length }} of {{ packages?.length || 0 }}</span>
+          <span op50>{{ normalizedPackages.length }} of {{ packages.length }}</span>
         </div>
       </template>
       <template v-else-if="settings.packageViewType === 'treemap'">
@@ -203,7 +228,7 @@ watch(() => settings.value.packageViewType, () => {
         </span>
       </template>
       <template v-else-if="settings.packageViewType === 'duplicate-packages'">
-        <PackagesDuplicated :packages="normalizedPackages" :session="session" />
+        <PackagesDuplicated :packages="packages" :session="session" />
       </template>
     </div>
     <DisplayGraphHoverView :hover-x="mouse.x" :hover-y="mouse.y">