-
Notifications
You must be signed in to change notification settings - Fork 96
fix: don't append custom collection prefixes to the shared collection list #533
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
giaBaoJS
wants to merge
1
commit into
nuxt:main
Choose a base branch
from
giaBaoJS:fix/runtime-collections-shared-list
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+55
−2
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { expect, it } from 'vitest' | ||
| import type { Nuxt } from '@nuxt/schema' | ||
| import type { IconifyJSON } from '@iconify/types' | ||
| import { NuxtIconModuleContext } from '../src/context' | ||
| import type { ModuleOptions, NuxtIconRuntimeOptions } from '../src/types' | ||
| import { collectionNames } from '../src/collection-names' | ||
|
|
||
| function createContext(options: Partial<ModuleOptions>) { | ||
| const nuxt = { | ||
| options: { | ||
| rootDir: '/root', | ||
| nitro: {}, | ||
| dev: false, | ||
| }, | ||
| } | ||
| return new NuxtIconModuleContext(nuxt as unknown as Nuxt, options as ModuleOptions) | ||
| } | ||
|
|
||
| // `module.ts` only reads `fallbackToApi` out of the runtime options here | ||
| const runtimeOptions = { fallbackToApi: true } as NuxtIconRuntimeOptions | ||
|
|
||
| const customCollection: IconifyJSON = { | ||
| prefix: 'my-icons', | ||
| icons: { | ||
| logo: { body: '<path d="M0 0h24v24H0z"/>' }, | ||
| }, | ||
| } | ||
|
|
||
| it('keeps custom collection prefixes out of the shared Iconify collection list', () => { | ||
| const ctx = createContext({ customCollections: [customCollection] }) | ||
| expect(ctx.getRuntimeCollections(runtimeOptions)).toContain('my-icons') | ||
|
|
||
| // Another app built in the same process must not inherit the first one's prefixes | ||
| const other = createContext({}) | ||
| expect(other.getRuntimeCollections(runtimeOptions)).not.toContain('my-icons') | ||
| expect(collectionNames).not.toContain('my-icons') | ||
| }) | ||
|
|
||
| it('does not add a remote endpoint for a custom collection', async () => { | ||
| const ctx = createContext({ | ||
| provider: 'server', | ||
| serverBundle: 'remote', | ||
| customCollections: [customCollection], | ||
| }) | ||
| // `module.ts` fills `appConfig.icon.collections` from this before the server bundle resolves | ||
| ctx.getRuntimeCollections(runtimeOptions) | ||
|
|
||
| const { collections } = await ctx.resolveServerBundle() | ||
| const entries = collections.filter(c => (typeof c === 'string' ? c : c.prefix) === 'my-icons') | ||
| expect(entries).toEqual([customCollection]) | ||
| }) | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Exercise the string
serverBundlebranch.fallbackToApi: trueselects the first branch ingetRuntimeCollections. The second test therefore does not execute theserverBundle === 'string'branch atsrc/context.tslines 33-34. Call it withfallbackToApi: falsein the remote-bundle test so the regression test covers the second copied branch.Proposed fix
🤖 Prompt for AI Agents