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

Optimize Babel output a little bit #1656

Merged
merged 11 commits into from
Jan 5, 2020
Merged

Optimize Babel output a little bit #1656

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
547c6a1
Optimize Babel output a little bit
Andarist Nov 27, 2019
d23ce55
Fix label regression in dev nodes
Andarist Dec 23, 2019
063aedc
Add `autoLabel` validation
Andarist Dec 23, 2019
bb81925
Update more snapshots
Andarist Dec 23, 2019
ca2e8c6
Fix flow error
Andarist Dec 23, 2019
d700725
Rename auto to dev-only as autoLabel value
Andarist Dec 31, 2019
3b72c55
appendExpressionToArguments -> appendStringReturningExpressionToArgum…
Andarist Dec 31, 2019
adab54c
Add simple tests for new autoLabel values
Andarist Dec 31, 2019
6f9aac2
Merge appendStringToArguments logic into appendStringReturningExpress…
Andarist Dec 31, 2019
00b06dd
Adjust docs about new autoLabel values
Andarist Jan 1, 2020
87a07e5
Add changeset
Andarist Jan 1, 2020
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
Prev Previous commit
Next Next commit
appendExpressionToArguments -> appendStringReturningExpressionToArgum… 
…ents
  • Loading branch information
@Andarist
Andarist committed Jan 1, 2020
commit 3b72c553a8298c49baa2be476173f5043040549d
6 changes: 5 additions & 1 deletion packages/babel-plugin-emotion/src/utils/arguments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
// @flow
import { isTaggedTemplateExpressionTranspiledByTypeScript } from './checks'

export const appendExpressionToArguments = (t: *, path: *, expression: *) => {
export const appendStringReturningExpressionToArguments = (
t: *,
path: *,
expression: *
) => {
let lastIndex = path.node.arguments.length - 1
let last = path.node.arguments[lastIndex]
if (t.isStringLiteral(last)) {
Expand Down
6 changes: 3 additions & 3 deletions packages/babel-plugin-emotion/src/utils/transform-expression-with-styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { getExpressionsFromTemplateLiteral } from './minify'
import { getLabelFromPath } from './label'
import { getSourceMap } from './source-maps'
import { simplifyObject } from './object-to-string'
import { appendExpressionToArguments } from './arguments'
import { appendStringReturningExpressionToArguments } from './arguments'
import { appendStringToArguments, joinStringLiterals } from './strings'

const CSS_OBJECT_STRINGIFIED_ERROR =
Expand Down Expand Up @@ -142,7 +142,7 @@ export let transformExpressionWithStyles = ({
t.stringLiteral(''),
t.stringLiteral(labelString)
)
appendExpressionToArguments(t, path, labelConditional)
appendStringReturningExpressionToArguments(t, path, labelConditional)
break
}
case 'always':
Expand All @@ -157,7 +157,7 @@ export let transformExpressionWithStyles = ({
t.stringLiteral(''),
t.stringLiteral(sourceMap)
)
appendExpressionToArguments(t, path, sourceMapConditional)
appendStringReturningExpressionToArguments(t, path, sourceMapConditional)
}

return { node: undefined, isPure }
Expand Down