Skip to content
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
12 changes: 12 additions & 0 deletions pnpm-lock.yaml

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

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
packages:
- xwiki-platform-core/xwiki-platform-blocknote/xwiki-platform-blocknote-webjar/src/main/node/
- xwiki-platform-core/xwiki-platform-bootstrap/src/main/node
- xwiki-platform-core/xwiki-platform-livedata/xwiki-platform-livedata-webjar/src/main/node/
- xwiki-platform-core/xwiki-platform-notifications/xwiki-platform-notifications-webjar/src/main/node/
- xwiki-platform-core/xwiki-platform-node/src/main/node/api
Expand Down
139 changes: 22 additions & 117 deletions xwiki-platform-core/xwiki-platform-bootstrap/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<artifactId>xwiki-platform-core</artifactId>
<version>18.0.0-SNAPSHOT</version>
</parent>
<packaging>webjar</packaging>
<packaging>webjar-node</packaging>
<artifactId>xwiki-platform-bootstrap</artifactId>
<name>XWiki Platform - Bootstrap</name>
<properties>
Expand All @@ -40,150 +40,55 @@
</properties>
<build>
<plugins>
<!-- We're skipping the license check because we put the actual original license in bootstrap file and not the
XWiki license -->
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-bootstrap-resources</id>
<!-- Copy the remaining less file. Can be removed once XWIKI-23080 is done. -->
<id>copy-less-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/bootstrap</outputDirectory>
<outputDirectory>
${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/less
</outputDirectory>
<resources>
<resource>
<directory>src/main/</directory>
<directory>${basedir}/src/main/node/less</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-bootstrap-tests-resources</id>
<!-- Copy the remaining less file. Can be removed once XWIKI-23080 is done. -->
<id>copy-font-resources</id>
<phase>validate</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/bootstrap/js/tests</outputDirectory>
<outputDirectory>
${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/fonts
</outputDirectory>
<resources>
<resource>
<directory>src/tests/</directory>
<directory>${basedir}/src/main/node/fonts</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<!-- Copy the generated bootstrap components to the WebJar folder. -->
<id>copy-bootstrap-components</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/bootstrap/dist</directory>
</resource>
</resources>
</configuration>
</execution>
<execution>
<!-- Copy the less bootstrap components to the WebJar folder. -->
<id>copy-bootstrap-less-components</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.outputDirectory}/META-INF/resources/webjars/${project.artifactId}/${project.version}/less</outputDirectory>
<resources>
<resource>
<directory>${project.build.directory}/bootstrap/less</directory>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<!-- We're disabling the JSHint check associated with the WebJar packaging because we use frontend-maven-plugin
below to perform linting. -->
<plugin>
<groupId>org.xwiki.contrib</groupId>
<artifactId>jshint-maven-plugin</artifactId>
<executions>
<execution>
<id>default-lint</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<executions>
<execution>
<id>install-node-and-npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
</configuration>
</execution>
<execution>
<id>npm-install</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>ci</arguments>
</configuration>
</execution>
<execution>
<id>npm-run-build</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>run build</arguments>
</configuration>
</execution>
<execution>
<id>npm-run-test</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>run test</arguments>
</configuration>
<phase>test</phase>
</execution>
<execution>
<id>npm-run-lint</id>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<arguments>run lint</arguments>
</configuration>
<phase>verify</phase>
</execution>
</executions>
<configuration>
<workingDirectory>${project.build.directory}/bootstrap/</workingDirectory>
</configuration>
</plugin>
<!-- We're skipping the license check because we put the actual original license in bootstrap file and not the
XWiki license -->
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
Expand Down

This file was deleted.

Loading