-
-
Notifications
You must be signed in to change notification settings - Fork 6.4k
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
feat(ssr): support external true #10939
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
8023592
feat(ssr): support external true
bluwy c81ab08
chore: fix test setup
bluwy d4806b3
docs: update external priority explanation
bluwy d506874
Merge branch 'main' into ssr-external-true
bluwy 47c5148
chore: fix lint
bluwy eb969a9
docs: update options explanation
bluwy f097f9f
chore: fix lockfile
bluwy e75c4d3
chore: update workspace config
bluwy a561663
chore: format
bluwy 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 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
4 changes: 4 additions & 0 deletions
4
packages/vite/src/node/ssr/__tests__/fixtures/cjs-ssr-dep/index.js
This file contains 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,4 @@ | ||
// eslint-disable-next-line no-undef | ||
module.exports = { | ||
hello: () => 'world', | ||
} |
5 changes: 5 additions & 0 deletions
5
packages/vite/src/node/ssr/__tests__/fixtures/cjs-ssr-dep/package.json
This file contains 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,5 @@ | ||
{ | ||
"name": "@vitejs/cjs-ssr-dep", | ||
"private": true, | ||
"version": "0.0.0" | ||
} |
This file contains 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,8 @@ | ||
{ | ||
"name": "@vitejs/unit-ssr", | ||
"private": true, | ||
"version": "0.0.0", | ||
"dependencies": { | ||
"@vitejs/cjs-ssr-dep": "link:./fixtures/cjs-ssr-dep" | ||
} | ||
} |
This file contains 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,29 @@ | ||
import { fileURLToPath } from 'node:url' | ||
import { describe, expect, test } from 'vitest' | ||
import type { SSROptions } from '..' | ||
import { resolveConfig } from '../../config' | ||
import { createIsConfiguredAsSsrExternal } from '../ssrExternal' | ||
|
||
describe('createIsConfiguredAsSsrExternal', () => { | ||
test('default', async () => { | ||
const isExternal = await createIsExternal() | ||
expect(isExternal('@vitejs/cjs-ssr-dep')).toBe(false) | ||
}) | ||
|
||
test('force external', async () => { | ||
const isExternal = await createIsExternal({ external: true }) | ||
expect(isExternal('@vitejs/cjs-ssr-dep')).toBe(true) | ||
}) | ||
}) | ||
|
||
async function createIsExternal(ssrConfig?: SSROptions) { | ||
const resolvedConfig = await resolveConfig( | ||
{ | ||
configFile: false, | ||
root: fileURLToPath(new URL('./', import.meta.url)), | ||
ssr: ssrConfig, | ||
}, | ||
'serve', | ||
) | ||
return createIsConfiguredAsSsrExternal(resolvedConfig) | ||
} |
This file contains 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 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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 |
---|---|---|
@@ -1,3 +1,4 @@ | ||
packages: | ||
- 'packages/*' | ||
- 'playground/**' | ||
- 'packages/**/__tests__/**' |
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.
Removed
const { ssr } = config
as it's already define above. Removedif (ssr) {
as it's always true.