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.

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

Tailwindcss V4 #11794

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
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
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
package tech.jhipster.lite.generator.client.react.security.jwt.domain;

import static tech.jhipster.lite.module.domain.JHipsterModule.LINE_BREAK;
import static tech.jhipster.lite.module.domain.JHipsterModule.from;
import static tech.jhipster.lite.module.domain.JHipsterModule.lineBeforeRegex;
import static tech.jhipster.lite.module.domain.JHipsterModule.lineBeforeText;
import static tech.jhipster.lite.module.domain.JHipsterModule.moduleBuilder;
import static tech.jhipster.lite.module.domain.JHipsterModule.packageName;
import static tech.jhipster.lite.module.domain.JHipsterModule.path;
import static tech.jhipster.lite.module.domain.JHipsterModule.regex;
import static tech.jhipster.lite.module.domain.JHipsterModule.text;
import static tech.jhipster.lite.module.domain.JHipsterModule.to;
import static tech.jhipster.lite.module.domain.JHipsterModule.*;
import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.COMMON;
import static tech.jhipster.lite.module.domain.npm.JHLiteNpmVersionSource.REACT;

Expand Down Expand Up @@ -57,12 +48,11 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
.addDependency(packageName("@heroui/react"), REACT)
.addDevDependency(packageName("autoprefixer"), COMMON)
.addDevDependency(packageName("sass"), REACT)
.addDevDependency(packageName("postcss"), COMMON)
.addDevDependency(packageName("@tailwindcss/vite"), COMMON)
.addDevDependency(packageName("tailwindcss"), COMMON)
.and()
.files()
.batch(ROOT, to("."))
.addFile("postcss.config.js")
.addFile("tailwind.config.js")
.and()
.add(APP_SOURCE.template("common/services/storage.ts"), COMMON_DESTINATION.append("services/storage.ts"))
Expand All @@ -87,6 +77,10 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
.add(TEST_JAVASCRIPT_SOURCE.template("common/services/storage.test.ts"), TEST_DESTINATION.append("common/services/storage.test.ts"))
.and()
.mandatoryReplacements()
.in(path("vite.config.ts"))
.add(lineAfterRegex("from 'vite';"), "import tailwindcss from '@tailwindcss/vite';")
.add(text("plugins: [react(), "), "plugins: [react(), tailwindcss(), ")
.and()
.in(path("src/main/webapp/app/home/infrastructure/primary/HomePage.tsx"))
.add(lineBeforeText("function HomePage() {"), "import LoginForm from '@/login/primary/loginForm';" + LINE_BREAK)
.add(LOGIN_FORM_MATCHER, properties.indentation().times(4) + "<LoginForm />")
Expand All @@ -103,7 +97,8 @@ public JHipsterModule buildModule(JHipsterModuleProperties properties) {
)
.and()
.in(path("src/main/webapp/app/index.css"))
.add(lineBeforeText("body {"), "@tailwind base;" + LINE_BREAK + "@tailwind components;" + LINE_BREAK + "@tailwind utilities;" + LINE_BREAK)
// .add(lineBeforeText("body {"), "@config '../../../../tailwind.config.js';" + LINE_BREAK + "@import 'tailwindcss';" + LINE_BREAK)
.add(lineBeforeText("body {"), "@import 'tailwindcss';" + LINE_BREAK)
.and()
.and()
.optionalReplacements()
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"@playwright/test": "1.50.0",
"@prettier/plugin-pug": "3.2.0",
"@prettier/plugin-xml": "3.4.1",
"@tailwindcss/vite": "4.0.0",
"@tikui/core": "6.3.0",
"@tsconfig/recommended": "1.0.8",
"@types/jest": "29.5.14",
Expand Down Expand Up @@ -51,7 +52,7 @@
"stylelint-config-concentric-order": "5.2.0",
"stylelint-config-standard-scss": "14.0.0",
"stylelint-order": "6.0.4",
"tailwindcss": "3.4.17",
"tailwindcss": "4.0.0",
"tikuidoc-tikui": "8.0.1",
"ts-jest": "29.2.5",
"typescript": "5.7.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,15 @@ class ReactJwtModuleFactoryTest {
void shouldBuildModule() {
JHipsterModule module = factory.buildModule(properties());

JHipsterModuleAsserter asserter = assertThatModuleWithFiles(module, packageJsonFile(), app(), appCss(), indexTsx(), indexCss());
JHipsterModuleAsserter asserter = assertThatModuleWithFiles(
module,
packageJsonFile(),
app(),
appCss(),
indexTsx(),
indexCss(),
viteReactConfigFile()
);

assertReactApp(asserter);
asserter
Expand Down Expand Up @@ -71,7 +79,7 @@ private void assertReactApp(JHipsterModuleAsserter asserter) {
asserter
.hasFile("package.json")
.containing(nodeDependency("autoprefixer"))
.containing(nodeDependency("postcss"))
.containing(nodeDependency("@tailwindcss/vite"))
.containing(nodeDependency("tailwindcss"))
.containing(nodeDependency("react-hook-form"))
.containing(nodeDependency("axios"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ public static ModuleFile vitestConfigFile() {
return file("src/main/resources/generator/typescript/vitest.config.ts.mustache", "vitest.config.ts");
}

public static ModuleFile viteReactConfigFile() {
return file("src/main/resources/generator/client/react/core/vite.config.ts.mustache", "vite.config.ts");
}

public static ModuleFile eslintConfigFile() {
return file("src/main/resources/generator/typescript/eslint.config.js.mustache", "eslint.config.js");
}
Expand Down