Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: add import support to ssrModuleLoader #5197

Merged
merged 22 commits into from
Oct 27, 2021
Merged

fix: add import support to ssrModuleLoader #5197

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
8c051c2
WIP: add import() support to ssrModuleLoader
Oct 4, 2021
1f3d1c6
revert esbuild version
Oct 4, 2021
f8ce107
chore: remove logs
Oct 5, 2021
4e872a1
refactor: apply feedback
Oct 5, 2021
44872c3
refactor: remove unused file
Oct 5, 2021
5621c2a
refactor: remove unused setting from rollup config
Oct 5, 2021
2d5ad2a
refactor(ssr): combine import handlers
Oct 5, 2021
c488335
fix(ssr): do not await nodeImport
Oct 6, 2021
8c36931
test(ssr): enable --experimental-vm-modules
Oct 6, 2021
71e01c3
feat: remove commonjs check in `resolveSSRExternal`
aleclarson Oct 6, 2021
77e3f9b
chore: use `isBuiltin` util
aleclarson Oct 6, 2021
b5d24d3
chore: run prettier
aleclarson Oct 6, 2021
5bcdcba
refactor(ssr): use `dynamicImport` util from #5213
Oct 7, 2021
f35add2
test(ssr): skip ssr cases in Jest
Oct 11, 2021
5a260d4
test(ssr): do not skip node/ssr in Jest
Oct 11, 2021
489658e
test(ssr): skip optimize-deps in Jest
Oct 11, 2021
9d3045e
test: enable ssr tests, fallback to require
Oct 11, 2021
9c0cb0e
test: fix ssr require?
Oct 11, 2021
756f77c
test: update dynamicImport util
Oct 12, 2021
9c6ab45
Merge branch 'vitejs:main' into feat/ssr-import
natemoo-re Oct 15, 2021
2c70d99
Get tests passing
matthewp Oct 15, 2021
7f827d3
Prefer default if it exists
matthewp Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/vite/src/node/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,4 +578,4 @@ export const singlelineCommentsRE = /\/\/.*/g
*
* @param file File path to import.
*/
export const dynamicImport = typeof jest === 'undefined' ? new Function('file', 'return import(file)') : new Function('file', 'return require(file)')
natemoo-re marked this conversation as resolved.
Show resolved Hide resolved
export const dynamicImport = typeof jest === 'undefined' ? new Function('file', 'return import(file)') : new Function('require', 'file', 'return require(file)').bind(null, require)