fix(tailwind): update layout without altering formatting #74
Conversation
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
commit: |
Comment on lines
+7
to
+35
| export function addEmpty(ast: AST.Root, contents: MagicString, importFrom: string): void { | ||
| const body = ast.instance?.content?.body || []; | ||
|
|
||
| addImportIfNecessary(ast, expectedImportDeclaration); | ||
| if (!body.length) { | ||
| contents.prepend(dedent` | ||
| <script> | ||
| import '${importFrom}'; | ||
| </script> | ||
|
|
||
| `); | ||
| return; | ||
| } | ||
|
|
||
| // check if already imported | ||
| for (const statement of body) { | ||
| if (statement.type === 'ImportDeclaration' && statement.source.value === importFrom) { | ||
| return; | ||
| } | ||
| } | ||
|
|
||
| const first_statement = body[0]; | ||
| if (!first_statement.range) { | ||
| throw new Error(`${JSON.stringify(first_statement)} is missing range information.}`); | ||
| } | ||
| const is_first_line_import = first_statement.type === 'ImportDeclaration'; | ||
| contents.prependLeft( | ||
| first_statement.range[0], | ||
| `import '${importFrom}';` + (is_first_line_import ? '\n\t' : '\n\n\t') | ||
| ); |
There was a problem hiding this comment.
one issue with this implementation is that it's not really focused on applying the import to JS modules. for instance, it's injecting the <script> tags when there's no body.
this would break if we were to run addEmpty to a JS file like:
name: () => 'foo.js',
content: ({ content }) => {
const { ast, generateCode } = parseScript(content);
const ms = new MagicString(content);
imports.addEmpty(ast, ms, '../app.css');
return ms.toString();
}
Comment on lines
+117
to
+121
| content: ({ content }) => { | ||
| content ||= '<slot />'; | ||
| const { ast, source } = svelteMagicAst(content); | ||
| imports.addEmpty(ast, source, '../app.css'); | ||
| return source.toString(); |
There was a problem hiding this comment.
how about this as an alternate approach? https://github.com/sveltejs/cli/pull/75/files#diff-225d2ebe1d2b9c148fe3d2d9cf3030b09ed48c73824c51ce3f7dbf8a02ea878eR122-R129
|
I might be missing something, but now that #75 is in, do we still need this? |
|
I'll close it for now. This is a more fine-grained approach, but there's not time to pursue it before launch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This just uses the Svelte 4
slotfor now. #69 was attempting to tackle thatSome other items we should do:
guessIndentStringand guess single vs double quoteaddEmpty. We don't necessarily want to pass in theAst,MagicString, andworkspaceas separate items