Skip to content
Open
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
9 changes: 6 additions & 3 deletions celements-admin-frontend/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
{
"name": "open-celements-admin",
"name": "@open-celements/admin",
"version": "0.1.0",
"private": true,
"private": false,
"type": "module",
"exports": {
"./src/*": "./src/*"
},
"scripts": {
"dev": "concurrently \"vite --mode dev\" \"npm:type-check-watch\" \"npm:test-watch\"",
"build": "npm run type-check && npm run test && vite build",
Expand Down Expand Up @@ -73,4 +76,4 @@
"last 2 versions",
"not dead"
]
}
}

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing eol@eof

34 changes: 34 additions & 0 deletions celements-webapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,40 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install-node-and-npm-admin-frontend</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<workingDirectory>../celements-admin-frontend</workingDirectory>
</configuration>
</execution>
<execution>
<id>npm-install-admin-frontend</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<workingDirectory>../celements-admin-frontend</workingDirectory>
<arguments>install --legacy-peer-deps</arguments>
</configuration>
</execution>
<execution>
<id>npm-build-admin-frontend</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-resources</phase>
<configuration>
<workingDirectory>../celements-admin-frontend</workingDirectory>
<arguments>run build</arguments>
</configuration>
</execution>
</executions>

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t think celements-webapp should enforce ../celements-admin-frontend in its maven lifecycle. these are separate deployables, so they should be built as distinct stages with their own artifacts. if we want a product-level quality gate, we should introduce an overall root-level celements-web build/job that fails if either fails.

is there a specific reason this needs to happen inside the war/webapp maven lifecycle?

</plugin>
<plugin>
<groupId>com.jarslab.maven</groupId>
Expand Down