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

Emotion SWC Plugin - Allow for jsxImportSource to be configurable #35963

Merged
merged 5 commits into from Apr 7, 2022
Merged

Emotion SWC Plugin - Allow for jsxImportSource to be configurable #35963

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6582244
Allowing the jsxImportSource to be configurable when using the Emotio…
JohnDaly Apr 7, 2022
c6b01e7
Adding test case
JohnDaly Apr 7, 2022
9207687
Addressing PR feedback
JohnDaly Apr 7, 2022
5b1988a
Moving getEmotionOptions call back to where it was previously
JohnDaly Apr 7, 2022
21cff5a
Merge branch 'canary' into fix/emotion-swc-jsx-import-source
balazsorban44 Apr 7, 2022
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
9 changes: 6 additions & 3 deletions packages/next/build/swc/options.js
View file
Open in desktop
Expand Up @@ -40,6 +40,7 @@ function getBaseSWCOptions({
const emitDecoratorMetadata = Boolean(
jsConfig?.compilerOptions?.emitDecoratorMetadata
)
const emotionOptions = getEmotionOptions(nextConfig, jsConfig, development)
return {
jsc: {
...(resolvedBaseUrl && paths
Expand All @@ -65,7 +66,7 @@ function getBaseSWCOptions({
decoratorMetadata: emitDecoratorMetadata,
react: {
importSource: nextConfig?.experimental?.emotion
Brooooooklyn marked this conversation as resolved.
Show resolved Hide resolved
? '@emotion/react'
? emotionOptions.jsxImportSource
: jsConfig?.compilerOptions?.jsxImportSource || 'react',
runtime: 'automatic',
pragma: 'React.createElement',
Expand Down Expand Up @@ -104,11 +105,11 @@ function getBaseSWCOptions({
reactRemoveProperties: nextConfig?.compiler?.reactRemoveProperties,
modularizeImports: nextConfig?.experimental?.modularizeImports,
relay: nextConfig?.compiler?.relay,
emotion: getEmotionOptions(nextConfig, development),
emotion: emotionOptions,
}
}

function getEmotionOptions(nextConfig, development) {
function getEmotionOptions(nextConfig, jsConfig, development) {
if (!nextConfig?.experimental?.emotion) {
return null
}
Expand All @@ -126,6 +127,8 @@ function getEmotionOptions(nextConfig, development) {
break
}
return {
jsxImportSource:
jsConfig?.compilerOptions?.jsxImportSource ?? '@emotion/react',
enabled: true,
autoLabel,
labelFormat: nextConfig?.experimental?.emotion?.labelFormat,
Expand Down