refactor: update theme paths (#8139)

* refactor: update theme paths

* update IT app shells

Author: sissbruecker

scripts/copy-theme-distribution.js

@@ -12,13 +12,14 @@ const path = require('path');
 const { execSync } = require('child_process');
 
 // Check command line arguments
-if (process.argv.length !== 4) {
-  console.error('Usage: node copy-theme-distribution.js <path-to-theme-class> <npm-theme-package>');
+if (process.argv.length !== 5) {
+  console.error('Usage: node copy-theme-distribution.js <path-to-theme-class> <npm-theme-package> <theme-path>');
   process.exit(1);
 }
 
 const javaThemeClass = process.argv[2];
 const npmThemePackage = process.argv[3];
+const themePath = process.argv[4];
 
 // Read Java file and extract NPM package info
 if (!fs.existsSync(javaThemeClass)) {
@@ -65,7 +66,7 @@ execSync('npm install', {
 });
 
 // Create target directory
-const targetDir = path.join('target/classes/META-INF/resources', npmThemePackage);
+const targetDir = path.join('target/classes/META-INF/resources', themePath);
 fs.mkdirSync(targetDir, { recursive: true });
 
 // Copy the distribution files

vaadin-accordion-flow-parent/vaadin-accordion-flow-integration-tests/src/main/java/com/vaadin/flow/component/app/TestAppShell.java

@@ -17,7 +17,8 @@
 
 import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.lumo.Lumo;
 
-@StyleSheet("@vaadin/vaadin-lumo-styles/lumo.css")
+@StyleSheet(Lumo.STYLESHEET)
 public class TestAppShell implements AppShellConfigurator {
 }

vaadin-app-layout-flow-parent/vaadin-app-layout-flow-integration-tests/src/main/java/com/vaadin/flow/component/app/TestAppShell.java

@@ -17,7 +17,8 @@
 
 import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.lumo.Lumo;
 
-@StyleSheet("@vaadin/vaadin-lumo-styles/lumo.css")
+@StyleSheet(Lumo.STYLESHEET)
 public class TestAppShell implements AppShellConfigurator {
 }

vaadin-aura-theme-flow-parent/vaadin-aura-theme-flow/pom.xml

@@ -37,6 +37,7 @@
                                 <argument>../../scripts/copy-theme-distribution.js</argument>
                                 <argument>src/main/java/com/vaadin/flow/theme/aura/Aura.java</argument>
                                 <argument>@vaadin/aura</argument>
+                                <argument>aura</argument>
                             </arguments>
                         </configuration>
                     </execution>

vaadin-aura-theme-flow-parent/vaadin-aura-theme-flow/src/main/java/com/vaadin/flow/theme/aura/Aura.java

@@ -16,11 +16,18 @@
 package com.vaadin.flow.theme.aura;
 
 import com.vaadin.flow.component.dependency.NpmPackage;
+import com.vaadin.flow.component.dependency.StyleSheet;
+import com.vaadin.flow.component.page.AppShellConfigurator;
 
 /**
  * Aura theme base class.
  */
 @NpmPackage(value = "@vaadin/aura", version = "25.0.0-alpha21")
 public class Aura {
-
+    /**
+     * The path to the Aura stylesheet. Can be used as argument to a
+     * {@link StyleSheet} on an {@link AppShellConfigurator} class to apply the
+     * Aura theme to an application.
+     */
+    public static final String STYLESHEET = "aura/aura.css";
 }

vaadin-avatar-flow-parent/vaadin-avatar-flow-integration-tests/src/main/java/com/vaadin/flow/component/app/TestAppShell.java

@@ -17,7 +17,8 @@
 
 import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.lumo.Lumo;
 
-@StyleSheet("@vaadin/vaadin-lumo-styles/lumo.css")
+@StyleSheet(Lumo.STYLESHEET)
 public class TestAppShell implements AppShellConfigurator {
 }

vaadin-board-flow-parent/vaadin-board-flow-integration-tests/src/main/java/com/vaadin/flow/component/app/TestAppShell.java

@@ -10,7 +10,8 @@
 
 import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.lumo.Lumo;
 
-@StyleSheet("@vaadin/vaadin-lumo-styles/lumo.css")
+@StyleSheet(Lumo.STYLESHEET)
 public class TestAppShell implements AppShellConfigurator {
 }

vaadin-button-flow-parent/vaadin-button-flow-integration-tests/src/main/java/com/vaadin/flow/component/app/TestAppShell.java

@@ -17,7 +17,8 @@
 
 import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.lumo.Lumo;
 
-@StyleSheet("@vaadin/vaadin-lumo-styles/lumo.css")
+@StyleSheet(Lumo.STYLESHEET)
 public class TestAppShell implements AppShellConfigurator {
 }

vaadin-card-flow-parent/vaadin-card-flow-integration-tests/src/main/java/com/vaadin/flow/component/app/TestAppShell.java

@@ -17,7 +17,8 @@
 
 import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.lumo.Lumo;
 
-@StyleSheet("@vaadin/vaadin-lumo-styles/lumo.css")
+@StyleSheet(Lumo.STYLESHEET)
 public class TestAppShell implements AppShellConfigurator {
 }

vaadin-charts-flow-parent/vaadin-charts-flow-integration-tests/src/main/java/com/vaadin/flow/component/app/TestAppShell.java

@@ -10,7 +10,8 @@
 
 import com.vaadin.flow.component.dependency.StyleSheet;
 import com.vaadin.flow.component.page.AppShellConfigurator;
+import com.vaadin.flow.theme.lumo.Lumo;
 
-@StyleSheet("@vaadin/vaadin-lumo-styles/lumo.css")
+@StyleSheet(Lumo.STYLESHEET)
 public class TestAppShell implements AppShellConfigurator {
 }