Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/big-chefs-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'sv': patch
---

fix: insert the `tailwindcss` vite plugin at the start of the plugin array
2 changes: 1 addition & 1 deletion packages/addons/tailwindcss/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default defineAddon({

const pluginsArray = object.property(param1, 'plugins', array.createEmpty());
const pluginFunctionCall = functions.call(vitePluginName, []);
array.push(pluginsArray, pluginFunctionCall);
array.unshift(pluginsArray, pluginFunctionCall);

return generateCode();
});
Expand Down
8 changes: 8 additions & 0 deletions packages/core/tests/js/arrays/unshift-object-array/output.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const array = [
{
test2: 'string'
},
{
test: true
}
];
16 changes: 16 additions & 0 deletions packages/core/tests/js/arrays/unshift-object-array/run.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { array, object, common, variables } from '@sveltejs/cli-core/js';
import type { ScriptFileEditor } from '@sveltejs/cli-core';

export function run({ ast }: ScriptFileEditor<any>): void {
const array1 = array.createEmpty();

const object1 = object.create({ test: common.expressionFromString('true') });
const object2 = object.create({ test2: common.createLiteral('string') });
array.unshift(array1, object1);
array.unshift(array1, object2);
array.unshift(array1, object2); // avoid duplication

// create declaration so that we serialize everything
const declaration = variables.declaration(ast, 'const', 'array', array1);
ast.body.push(declaration);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
const array = ['test2', 'test'];
13 changes: 13 additions & 0 deletions packages/core/tests/js/arrays/unshift-string-array/run.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { array, variables } from '@sveltejs/cli-core/js';
import type { ScriptFileEditor } from '@sveltejs/cli-core';

export function run({ ast }: ScriptFileEditor<any>): void {
const array1 = array.createEmpty();
array.unshift(array1, 'test');
array.unshift(array1, 'test2');
array.unshift(array1, 'test'); // make sure items are not duplicated

// create declaration so that we serialize everything
const declaration = variables.declaration(ast, 'const', 'array', array1);
ast.body.push(declaration);
}
40 changes: 23 additions & 17 deletions packages/core/tooling/js/array.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,36 @@ export function push(
ast: AstTypes.ArrayExpression,
data: string | AstKinds.ExpressionKind | AstKinds.SpreadElementKind
): void {
if (typeof data === 'string') {
const existingLiterals = ast.elements.filter(
(x): x is AstTypes.StringLiteral => x?.type == 'StringLiteral'
);
let literal = existingLiterals.find((x) => x.value == data);
insertElement(ast, data, true);
}
export function unshift(
ast: AstTypes.ArrayExpression,
data: string | AstKinds.ExpressionKind | AstKinds.SpreadElementKind
): void {
insertElement(ast, data, false);
}

function insertElement(
ast: AstTypes.ArrayExpression,
data: string | AstKinds.ExpressionKind | AstKinds.SpreadElementKind,
insertEnd: boolean
): void {
if (typeof data === 'string') {
const existingLiterals = ast.elements.filter((x) => x?.type === 'StringLiteral');
let literal = existingLiterals.find((x) => x.value === data);
if (!literal) {
literal = {
type: 'StringLiteral',
value: data
};
ast.elements.push(literal);
literal = { type: 'StringLiteral', value: data };

if (insertEnd) ast.elements.push(literal);
else ast.elements.unshift(literal);
}
} else {
let anyNodeEquals = false;
const elements = ast.elements as AstTypes.ASTNode[];
for (const node of elements) {
if (areNodesEqual(data, node)) {
anyNodeEquals = true;
}
}
const anyNodeEquals = elements.some((node) => areNodesEqual(data, node));

if (!anyNodeEquals) {
ast.elements.push(data);
if (insertEnd) ast.elements.push(data);
else ast.elements.unshift(data);
}
}
}