chore: remove hilla-*-version.json from hilla artifacts, they are pro…

…vided by platform (#2008) * chore: remove hilla-*-version.json from hilla artifacts, they are provided by flow * test: fix tests by manually adding vaadin-core-versions.json instead of reusing from platform * chore: update versions in package*json files * test: switch modules tested in windows and linux * Remove stable ver * test: temporary remove pro components from tests * chore: update versions package*json files --------- Co-authored-by: Mikhail Shabarov <[email protected]>
vaadin · Feb 2, 2024 · 4ce65b8 · 4ce65b8
1 parent b79fbfa
commit 4ce65b8
Show file tree

Hide file tree

Showing 32 changed files with 7,056 additions and 30,903 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,8 @@ packages/java/hilla-react/*.json
 packages/java/hilla/src/main/java/com/vaadin/hilla/theme/
 packages/java/hilla-react/src/main/java/com/vaadin/hilla/theme/
 
+packages/**/resources/vaadin-core-versions.json
+
 # npm pack
 packages/ts/*/*.tgz
 

diff --git a/packages/java/hilla-react/pom.xml b/packages/java/hilla-react/pom.xml
@@ -91,28 +91,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <!-- Copy versions file to classpath, so that Flow can use
-                    it to pin versions for pnpm. -->
-                <groupId>com.coderplus.maven.plugins</groupId>
-                <artifactId>copy-rename-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-and-rename-file</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <sourceFile>${basedir}/hilla-react-versions.json</sourceFile>
-                            <!-- use vaadin-core-versions.json here, as flow check this file firstly.
-                                 later we should consider to split this file for core and pro components. -->
-                            <destinationFile>${basedir}/target/classes/vaadin-core-versions.json</destinationFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <executions>
@@ -131,5 +109,4 @@
             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/packages/java/hilla/pom.xml b/packages/java/hilla/pom.xml
@@ -91,28 +91,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <!-- Copy versions file to classpath, so that Flow can use
-                    it to pin versions for pnpm. -->
-                <groupId>com.coderplus.maven.plugins</groupId>
-                <artifactId>copy-rename-maven-plugin</artifactId>
-                <version>1.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-and-rename-file</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <sourceFile>${basedir}/hilla-versions.json</sourceFile>
-                            <!-- use vaadin-core-versions.json here, as flow check this file firstly.
-                                 later we should consider to split this file for core and pro components. -->
-                            <destinationFile>${basedir}/target/classes/vaadin-core-versions.json</destinationFile>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <executions>

diff --git a/packages/java/tests/csrf-context/package-lock.json b/packages/java/tests/csrf-context/package-lock.json
diff --git a/packages/java/tests/csrf-context/package.json b/packages/java/tests/csrf-context/package.json
@@ -17,7 +17,7 @@
     "@vaadin/hilla-generator-utils": "../../../ts/generator-utils",
     "@vaadin/router": "1.7.5",
     "construct-style-sheets-polyfill": "3.1.0",
-    "lit": "3.1.1"
+    "lit": "3.1.2"
   },
   "devDependencies": {
     "@babel/preset-react": "^7",
@@ -32,7 +32,7 @@
     "transform-ast": "2.4.4",
     "typescript": "5.3.3",
     "vite": "5.0.12",
-    "vite-plugin-checker": "0.6.2",
+    "vite-plugin-checker": "0.6.4",
     "workbox-build": "7.0.0",
     "workbox-core": "7.0.0",
     "workbox-precaching": "7.0.0"
@@ -53,7 +53,7 @@
       "@vaadin/hilla-generator-utils": "24.4.0-alpha2",
       "@vaadin/router": "1.7.5",
       "construct-style-sheets-polyfill": "3.1.0",
-      "lit": "3.1.1"
+      "lit": "3.1.2"
     },
     "devDependencies": {
       "@babel/preset-react": "^7",
@@ -68,18 +68,17 @@
       "transform-ast": "2.4.4",
       "typescript": "5.3.3",
       "vite": "5.0.12",
-      "vite-plugin-checker": "0.6.2",
+      "vite-plugin-checker": "0.6.4",
       "workbox-build": "7.0.0",
       "workbox-core": "7.0.0",
       "workbox-precaching": "7.0.0"
     },
-    "hash": "9d2851f250d868deb8bcd4fd46d7f7958eacdef15c7ea79bac5195e1d2bc6485"
+    "hash": "6a9fc251c02ee615a6942612684119ddaf239cd5026dde8d93e7bd7b54576ff3"
   },
   "overrides": {
     "@vaadin/common-frontend": "$@vaadin/common-frontend",
     "construct-style-sheets-polyfill": "$construct-style-sheets-polyfill",
     "lit": "$lit",
-    "@vaadin/router": "$@vaadin/router",
     "@polymer/polymer": "$@polymer/polymer",
     "@vaadin/hilla-core": "$@vaadin/hilla-core",
     "@vaadin/hilla-generator-cli": "$@vaadin/hilla-generator-cli",
@@ -89,6 +88,7 @@
     "@vaadin/hilla-generator-plugin-client": "$@vaadin/hilla-generator-plugin-client",
     "@vaadin/hilla-generator-plugin-model": "$@vaadin/hilla-generator-plugin-model",
     "@vaadin/hilla-generator-plugin-push": "$@vaadin/hilla-generator-plugin-push",
-    "@vaadin/hilla-generator-utils": "$@vaadin/hilla-generator-utils"
+    "@vaadin/hilla-generator-utils": "$@vaadin/hilla-generator-utils",
+    "@vaadin/router": "$@vaadin/router"
   }
 }