ci: 前端采用pom编译,统一node npm版本
This commit is contained in:
parent
bf2b874fb5
commit
f1addd3018
|
@ -32,5 +32,4 @@ qywx.json
|
||||||
|
|
||||||
### flattened
|
### flattened
|
||||||
.flattened-pom.xml
|
.flattened-pom.xml
|
||||||
.node/
|
|
||||||
**/jmeter/lib/ext
|
**/jmeter/lib/ext
|
|
@ -24,8 +24,8 @@ yarn-error.log*
|
||||||
*.sw?
|
*.sw?
|
||||||
|
|
||||||
|
|
||||||
src/main/resources/static
|
app/src/main/resources/static
|
||||||
src/main/resources/public
|
app/src/main/resources/public
|
||||||
|
|
||||||
|
|
||||||
target
|
target
|
||||||
|
|
|
@ -100,6 +100,55 @@
|
||||||
</excludes>
|
</excludes>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<artifactId>maven-clean-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<filesets>
|
||||||
|
<fileset>
|
||||||
|
<directory>src/main/resources/static</directory>
|
||||||
|
<includes>
|
||||||
|
<include>**</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
<fileset>
|
||||||
|
<directory>src/main/resources/public</directory>
|
||||||
|
<includes>
|
||||||
|
<include>**</include>
|
||||||
|
</includes>
|
||||||
|
<followSymlinks>false</followSymlinks>
|
||||||
|
</fileset>
|
||||||
|
</filesets>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>main-class-placement</id>
|
||||||
|
<phase>generate-resources</phase>
|
||||||
|
<configuration>
|
||||||
|
<skip>${skipAntRunForJenkins}</skip>
|
||||||
|
<target>
|
||||||
|
<copy todir="src/main/resources/static">
|
||||||
|
<fileset dir="../../frontend/dist">
|
||||||
|
<exclude name="*.html"/>
|
||||||
|
</fileset>
|
||||||
|
</copy>
|
||||||
|
<copy todir="src/main/resources/public">
|
||||||
|
<fileset dir="../../frontend/dist">
|
||||||
|
<include name="*.html"/>
|
||||||
|
</fileset>
|
||||||
|
</copy>
|
||||||
|
</target>
|
||||||
|
</configuration>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-dependency-plugin</artifactId>
|
<artifactId>maven-dependency-plugin</artifactId>
|
||||||
|
|
|
@ -4,3 +4,7 @@ dist-ssr
|
||||||
*.local
|
*.local
|
||||||
.history
|
.history
|
||||||
coverage
|
coverage
|
||||||
|
.node/
|
||||||
|
package-lock.json
|
||||||
|
pnpm-lock.yaml
|
||||||
|
yarn.lock
|
|
@ -25,7 +25,7 @@
|
||||||
<artifactId>frontend-maven-plugin</artifactId>
|
<artifactId>frontend-maven-plugin</artifactId>
|
||||||
<version>${frontend-maven-plugin.version}</version>
|
<version>${frontend-maven-plugin.version}</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<installDirectory>node</installDirectory>
|
<installDirectory>.node</installDirectory>
|
||||||
</configuration>
|
</configuration>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
|
@ -42,17 +42,16 @@
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
<!-- Install all project dependencies -->
|
<!-- Install all project dependencies -->
|
||||||
<!-- todo 前端项目打包配置-->
|
<execution>
|
||||||
<!--<execution>
|
|
||||||
<id>npm install</id>
|
<id>npm install</id>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>npm</goal>
|
<goal>npm</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<!– optional: The default argument is actually
|
<!-- optional: The default argument is actually
|
||||||
"install", so unless you need to run some other yarn command,
|
"install", so unless you need to run some other yarn command,
|
||||||
you can remove this whole <configuration> section.
|
you can remove this whole <configuration> section.
|
||||||
–>
|
-->
|
||||||
<arguments>install</arguments>
|
<arguments>install</arguments>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
@ -64,7 +63,7 @@
|
||||||
<configuration>
|
<configuration>
|
||||||
<arguments>run build</arguments>
|
<arguments>run build</arguments>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>-->
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
4
pom.xml
4
pom.xml
|
@ -90,8 +90,8 @@
|
||||||
<httpclient.version>4.5.14</httpclient.version>
|
<httpclient.version>4.5.14</httpclient.version>
|
||||||
<!-- frontend -->
|
<!-- frontend -->
|
||||||
<frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
|
<frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
|
||||||
<node.version>v16.10.0</node.version>
|
<node.version>v16.20.0</node.version>
|
||||||
<npm.version>8.12.1</npm.version>
|
<npm.version>8.19.4</npm.version>
|
||||||
<!-- -->
|
<!-- -->
|
||||||
<skipAntRunForJenkins>false</skipAntRunForJenkins>
|
<skipAntRunForJenkins>false</skipAntRunForJenkins>
|
||||||
<commons-dbcp2-version>2.9.0</commons-dbcp2-version>
|
<commons-dbcp2-version>2.9.0</commons-dbcp2-version>
|
||||||
|
|
Loading…
Reference in New Issue