Fixes #3589: problems of the standard template project build

mbarto · mbarto · commit 91fa234c7467 · 2019-02-28T16:00:17.000+01:00
diff --git a/project/standard/templates/prod-webpack.config.js b/project/standard/templates/prod-webpack.config.js
@@ -25,20 +25,20 @@ module.exports = require('./MapStore2/buildConfig')(
     '.__PROJECTNAME__',
     [
         new HtmlWebpackPlugin({
-            template: path.join(paths.framework, 'indexTemplate.html'),
+            template: path.join(__dirname, 'indexTemplate.html'),
             chunks: ['__PROJECTNAME__'],
             inject: true,
             hash: true
         }),
         new HtmlWebpackPlugin({
-            template: path.join(paths.framework, 'embeddedTemplate.html'),
+            template: path.join(__dirname, 'embeddedTemplate.html'),
             chunks: ['__PROJECTNAME__-embedded'],
             inject: true,
             hash: true,
             filename: 'embedded.html'
         }),
         new HtmlWebpackPlugin({
-            template: path.join(paths.framework, 'apiTemplate.html'),
+            template: path.join(__dirname, 'apiTemplate.html'),
             chunks: ['__PROJECTNAME__-api'],
             inject: 'head',
             hash: true,
diff --git a/project/standard/templates/web/pom.xml b/project/standard/templates/web/pom.xml
@@ -150,7 +150,7 @@
                     </configuration>
                 </execution>
                 <execution>
-                    <id>html, configuration files and images</id>
+                <id>only index.html</id>
                     <phase>process-classes</phase>
                     <goals>
                         <goal>copy-resources</goal>
@@ -160,27 +160,20 @@
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
-                                <directory>${basedir}/..</directory>
+                                <directory>${basedir}/../dist</directory>
                                 <includes>
-                                    <include>**/*.html</include>
-                                    <include>**/*.json</include>
-                                    <include>**/img/*</include>
-                                    <include>**/*.less</include>
+                                    <include>index.html</include>
                                 </includes>
                                 <excludes>
-                                    <exclude>node_modules/*</exclude>
-                                    <exclude>node_modules/**/*</exclude>
                                     <exclude>MapStore2/*</exclude>
                                     <exclude>MapStore2/**/*</exclude>
-                                    <exclude>**/libs/Cesium/**/*</exclude>
-                                    <exclude>**/test-resources/*</exclude>
                                 </excludes>
                             </resource>
                         </resources>
                     </configuration>
                 </execution>
                 <execution>
-                <id>only index.html</id>
+                    <id>only embedded.html</id>
                     <phase>process-classes</phase>
                     <goals>
                         <goal>copy-resources</goal>
@@ -192,7 +185,7 @@
                             <resource>
                                 <directory>${basedir}/../dist</directory>
                                 <includes>
-                                    <include>index.html</include>
+                                    <include>embedded.html</include>
                                 </includes>
                                 <excludes>
                                     <exclude>MapStore2/*</exclude>
@@ -203,7 +196,7 @@
                     </configuration>
                 </execution>
                 <execution>
-                    <id>only embedded.html</id>
+                    <id>only api.html</id>
                     <phase>process-classes</phase>
                     <goals>
                         <goal>copy-resources</goal>
@@ -215,7 +208,7 @@
                             <resource>
                                 <directory>${basedir}/../dist</directory>
                                 <includes>
-                                    <include>embedded.html</include>
+                                    <include>api.html</include>
                                 </includes>
                                 <excludes>
                                     <exclude>MapStore2/*</exclude>
@@ -226,7 +219,7 @@
                     </configuration>
                 </execution>
                 <execution>
-                    <id>only api.html</id>
+                    <id>html, configuration files and images</id>
                     <phase>process-classes</phase>
                     <goals>
                         <goal>copy-resources</goal>
@@ -236,13 +229,20 @@
                         <encoding>UTF-8</encoding>
                         <resources>
                             <resource>
-                                <directory>${basedir}/../dist</directory>
+                                <directory>${basedir}/..</directory>
                                 <includes>
-                                    <include>api.html</include>
+                                    <include>**/*.html</include>
+                                    <include>**/*.json</include>
+                                    <include>**/img/*</include>
+                                    <include>**/*.less</include>
                                 </includes>
                                 <excludes>
+                                    <exclude>node_modules/*</exclude>
+                                    <exclude>node_modules/**/*</exclude>
                                     <exclude>MapStore2/*</exclude>
                                     <exclude>MapStore2/**/*</exclude>
+                                    <exclude>**/libs/Cesium/**/*</exclude>
+                                    <exclude>**/test-resources/*</exclude>
                                 </excludes>
                             </resource>
                         </resources>
