Skip to content

Commit 2fe643d

Browse files
committed
fix: reorder tailwindcss and analog plugins in Vite config for consistency
1 parent 390be50 commit 2fe643d

8 files changed

Lines changed: 10 additions & 10 deletions

File tree

packages/create-analog/__tests__/cli.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const expectTailwindScaffold = () => {
5555
expect(readGeneratedStyles()).toContain(`@import 'tailwindcss';`);
5656
expect(viteConfig).toContain(`import tailwindcss from '@tailwindcss/vite';`);
5757
expect(viteConfig).toMatch(
58-
/plugins:\s*\[[\s\S]*tailwindcss\(\),[\s\S]*analog\(/,
58+
/plugins:\s*\[[\s\S]*analog\(\),[\s\S]*tailwindcss\(\)/,
5959
);
6060
expect(readFileSync(join(genPath, 'postcss.config.mjs'), 'utf-8')).toContain(
6161
`'@tailwindcss/postcss': {}`,

packages/create-analog/template-latest/vite.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ export default defineConfig(({ mode }) => ({
1212
mainFields: ['module'],
1313
},
1414
plugins: [
15-
__TAILWIND_PLUGIN__ analog(),
16-
],
15+
analog(),
16+
__TAILWIND_PLUGIN__ ],
1717
test: {
1818
globals: true,
1919
environment: 'jsdom',

packages/nx-plugin/src/generators/app/files/template-angular-v17/vite.config.ts__template__

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ export default defineConfig(({ mode }) => {
2424
},
2525
},
2626
plugins: [
27+
analog(),
2728
<% if (addTailwind) { %>
2829
tailwindcss(),
2930
<% } %>
30-
analog(),
3131
nxViteTsPaths(),
3232
],
3333
test: {

packages/nx-plugin/src/generators/app/files/template-angular-v18/vite.config.ts__template__

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ export default defineConfig(({ mode }) => {
2323
},
2424
},
2525
plugins: [
26-
<% if (addTailwind) { %>
26+
analog(),
27+
<% if (addTailwind) { %>
2728
tailwindcss(),
2829
<% } %>
29-
analog(),
3030
nxViteTsPaths(),
3131
],
3232
test: {

packages/nx-plugin/src/generators/app/files/template-angular-v19/vite.config.ts__template__

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ export default defineConfig(({ mode }) => {
2323
},
2424
},
2525
plugins: [
26+
analog(),
2627
<% if (addTailwind) { %>
2728
tailwindcss(),
2829
<% } %>
29-
analog(),
3030
nxViteTsPaths(),
3131
],
3232
test: {

packages/nx-plugin/src/generators/app/files/template-angular/vite.config.ts__template__

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ export default defineConfig(({ mode }) => {
2323
},
2424
},
2525
plugins: [
26+
analog(),
2627
<% if (addTailwind) { %>
2728
tailwindcss(),
2829
<% } %>
29-
analog(),
3030
nxViteTsPaths(),
3131
],
3232
test: {

packages/nx-plugin/src/generators/app/generator.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ describe('nx-plugin generator', () => {
114114
`import tailwindcss from '@tailwindcss/vite';`,
115115
);
116116
expect(viteConfig).toMatch(
117-
/plugins:\s*\[[\s\S]*tailwindcss\(\),[\s\S]*analog\(/,
117+
/plugins:\s*\[[\s\S]*analog\(\),[\s\S]*tailwindcss\(\)/,
118118
);
119119
};
120120

packages/nx-plugin/src/generators/preset/__snapshots__/generator.spec.ts.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export default defineConfig(({ mode }) => {
120120
allow: ['.'],
121121
},
122122
},
123-
plugins: [tailwindcss(), analog(), nxViteTsPaths()],
123+
plugins: [analog(), tailwindcss(), nxViteTsPaths()],
124124
test: {
125125
globals: true,
126126
environment: 'jsdom',

0 commit comments

Comments
 (0)