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.

Sign up for GitHub

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

chore: remove hilla-*-version.json from hilla artifacts, they are provided by platform #2008

Merged
merged 7 commits into from
Feb 2, 2024
Merged

chore: remove hilla-*-version.json from hilla artifacts, they are provided by platform #2008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
99673ff
chore: remove hilla-*-version.json from hilla artifacts, they are pro…
manolo Jan 30, 2024
763f566
test: fix tests by manually adding vaadin-core-versions.json instead …
manolo Jan 31, 2024
c8dea70
chore: update versions in package*json files
manolo Feb 1, 2024
895c691
test: switch modules tested in windows and linux
manolo Feb 1, 2024
d1d75c4
Remove stable ver
mshabarov Feb 1, 2024
eaeede3
test: temporary remove pro components from tests
manolo Feb 2, 2024
2ee49dd
chore: update package files
manolo Feb 2, 2024
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
23 changes: 0 additions & 23 deletions packages/java/hilla-react/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -131,5 +109,4 @@
</plugin>
</plugins>
</build>

</project>
22 changes: 0 additions & 22 deletions packages/java/hilla/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
132 changes: 58 additions & 74 deletions packages/java/tests/csrf-context/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions packages/java/tests/csrf-context/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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"
}
}
Loading
Loading