Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
3 changes: 2 additions & 1 deletion .github/workflows/release-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
FROM_REF: ${{ steps.version.outputs.from }}
run: node scripts/release-notes.ts "$FROM_REF" > /tmp/release-notes.md
TO_REF: ${{ steps.version.outputs.next }}
run: node scripts/release-notes.ts "$FROM_REF" "$TO_REF" > /tmp/release-notes.md

- name: 🚀 Create GitHub Release
if: steps.check.outputs.skip == 'false'
Expand Down
1 change: 0 additions & 1 deletion app/components/Package/TimelineChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,6 @@ function stackbarTooltipPoints(
}
})
.filter(point => point.size > 0)
.toReversed()
}

function areAllValuesEqual(array: number[]): boolean {
Expand Down
1 change: 1 addition & 0 deletions cli/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export default defineConfig({
dts: true,
outDir: 'dist',
deps: {
resolveDepSubpath: true,
neverBundle: ['@lydell/node-pty'],
},
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"vite-plugin-pwa": "1.3.0",
"vite-plus": "catalog:vite-plus",
"vue": "3.5.42",
"vue-data-ui": "3.25.0",
"vue-data-ui": "3.25.5",
"vue-router": "5.2.0"
},
"devDependencies": {
Expand Down
1,249 changes: 637 additions & 612 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ catalogs:
'storybook-i18n': '^10.1.1'

vite-plus:
'vite': 'npm:@voidzero-dev/vite-plus-core@0.3.0'
'vite-plus': '0.3.0'
'vite': 'npm:@voidzero-dev/vite-plus-core@0.3.1'
'vite-plus': '0.3.1'
'vitest': '4.1.11'
'@vitest/browser-playwright': '4.1.11'
'@vitest/coverage-v8': '4.1.11'
Expand All @@ -48,7 +48,6 @@ minimumReleaseAgeExclude:
- '@nuxt/nitro-server@4.5.2'
- '@nuxt/schema@4.5.2'
- '@nuxt/vite-builder@4.5.2'
- vue-data-ui@3.25.0

minimumReleaseAgeExcludePrune: true

Expand Down
16 changes: 14 additions & 2 deletions server/utils/docs/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ import { isBuiltin } from 'node:module'
/** Timeout for fetching modules in milliseconds */
const FETCH_TIMEOUT_MS = 30 * 1000

const IS_SOURCE_MAP = /\.(?:js|mjs|cjs|d\.[mc]?ts)\.map(?:[?#].*)?$/

// =============================================================================
// Main Export
// =============================================================================
Expand Down Expand Up @@ -70,7 +72,7 @@ interface LoadResponse {
*
* Fetches modules from URLs using fetch(), with proper timeout handling.
*/
function createLoader(): (
export function createLoader(): (
specifier: string,
isDynamic?: boolean,
cacheSetting?: string,
Expand All @@ -82,6 +84,10 @@ function createLoader(): (
_cacheSetting?: string,
_checksum?: string,
) => {
if (IS_SOURCE_MAP.test(specifier)) {
return undefined
}

const url = URL.parse(specifier)

if (url === null) {
Expand Down Expand Up @@ -130,8 +136,14 @@ function createLoader(): (
*
* Handles resolving relative imports and esm.sh redirects.
*/
function createResolver(): (specifier: string, referrer: string) => string {
export function createResolver(): (specifier: string, referrer: string) => string {
return (specifier: string, referrer: string) => {
// Source map references are not modules. Resolving bare source map
// filenames can incorrectly treat them as package specifiers
if (IS_SOURCE_MAP.test(specifier)) {
return specifier
}

// Handle relative imports
if (specifier.startsWith('.') || specifier.startsWith('/')) {
return new URL(specifier, referrer).toString()
Expand Down
89 changes: 89 additions & 0 deletions test/unit/server/utils/docs/client.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import { describe, expect, it, vi, afterEach } from 'vitest'
import { createResolver, createLoader } from '#server/utils/docs/client'

describe('createResolver', () => {
const resolve = createResolver()
const referrer = 'https://esm.sh/effect-web-midi@0.2.1/dist-types/index.d.ts'

it('resolves relative imports', () => {
expect(resolve('./src/index.d.ts', referrer)).toBe(
'https://esm.sh/effect-web-midi@0.2.1/dist-types/src/index.d.ts',
)
})

it('resolves absolute paths', () => {
expect(resolve('/foo.d.ts', referrer)).toBe('https://esm.sh/foo.d.ts')
})

it('resolves bare specifiers', () => {
expect(resolve('effect', referrer)).toBe('https://esm.sh/effect')
})

it('leaves absolute URLs unchanged', () => {
expect(resolve('https://esm.sh/effect', referrer)).toBe('https://esm.sh/effect')
})

it('leaves node builtins unchanged', () => {
expect(resolve('node:fs', referrer)).toBe('node:fs')
})

// Issue #2739: Prevent sourceMappingURL specifiers from being resolved as package names
// https://github.com/npmx-dev/npmx.dev/issues/2739
it('does not resolve source map references', () => {
expect(resolve('index.d.ts.map', referrer)).toBe('index.d.ts.map')
expect(resolve('./index.d.ts.map', referrer)).toBe('./index.d.ts.map')
})

it('does not falsely flag packages containing the word map', () => {
expect(resolve('source-map', referrer)).toBe('https://esm.sh/source-map')
expect(resolve('my.package.map', referrer)).toBe('https://esm.sh/my.package.map')
})
})

describe('createLoader', () => {
const load = createLoader()

afterEach(() => {
vi.unstubAllGlobals()
})

it('returns undefined for source map files', async () => {
expect(await load('index.d.ts.map')).toBeUndefined()
expect(await load('https://esm.sh/foo.js.map')).toBeUndefined()
expect(await load('index.d.ts.map?v=123')).toBeUndefined()
expect(await load('https://esm.sh/foo.js.map#hash')).toBeUndefined()
})

it('returns undefined for invalid or non-HTTP URLs', async () => {
expect(await load('not-a-valid-url')).toBeUndefined()
expect(await load('node:fs')).toBeUndefined()
expect(await load('file:///etc/passwd')).toBeUndefined()
})

it('fetches and returns module content for valid URLs', async () => {
const mockFetch = vi.fn().mockResolvedValue({
status: 200,
url: 'https://esm.sh/foo@1.0.0/index.d.ts',
headers: new Headers({ 'content-type': 'application/typescript' }),
_data: { text: async () => 'export const foo = 1;' },
})
vi.stubGlobal('$fetch', { raw: mockFetch })

const result = await load('https://esm.sh/foo@1.0.0/index.d.ts')

expect(result).toEqual({
kind: 'module',
specifier: 'https://esm.sh/foo@1.0.0/index.d.ts',
headers: { 'content-type': 'application/typescript' },
content: 'export const foo = 1;',
})
expect(mockFetch).toHaveBeenCalledTimes(1)
})

it('returns undefined if the fetch fails (non-200 status)', async () => {
const mockFetch = vi.fn().mockResolvedValue({ status: 404 })
vi.stubGlobal('$fetch', { raw: mockFetch })

expect(await load('https://esm.sh/foo@1.0.0/missing.d.ts')).toBeUndefined()
})
})
Loading