You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/04/22 09:51:29 UTC
[isis] branch master updated: ISIS-2445: vaa: don't gitignore 'frontend', ignore 'generated' instead
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 4972ff8945 ISIS-2445: vaa: don't gitignore 'frontend', ignore 'generated' instead
4972ff8945 is described below
commit 4972ff894519ec3bca9ed70761282f839ba1cf5b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Apr 22 11:51:21 2022 +0200
ISIS-2445: vaa: don't gitignore 'frontend', ignore 'generated' instead
- fixes build module-all
---
incubator/viewers/graphql/viewer/pom.xml | 8 ++++++++
incubator/viewers/vaadin/.gitignore | 2 +-
incubator/viewers/vaadin/ui/.gitignore | 1 -
incubator/viewers/vaadin/ui/frontend/index.html | 23 ++++++++++++++++++++++
.../src/main/resources/static/frontend/index.html | 23 ++++++++++++++++++++++
5 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/incubator/viewers/graphql/viewer/pom.xml b/incubator/viewers/graphql/viewer/pom.xml
index 298869dfd9..480e100407 100644
--- a/incubator/viewers/graphql/viewer/pom.xml
+++ b/incubator/viewers/graphql/viewer/pom.xml
@@ -29,6 +29,14 @@
<git-plugin.propertiesDir>org/apache/isis/incubator/viewer/graphql/viewer</git-plugin.propertiesDir>
</properties>
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <filtering>false</filtering>
+ </testResource>
+ </testResources>
+ </build>
<dependencies>
<dependency>
diff --git a/incubator/viewers/vaadin/.gitignore b/incubator/viewers/vaadin/.gitignore
index 6984623006..6abc0102ec 100644
--- a/incubator/viewers/vaadin/.gitignore
+++ b/incubator/viewers/vaadin/.gitignore
@@ -4,7 +4,7 @@ drivers/
error-screenshots/
# More Node stuff as introduced with Vaadin
node/
-frontend/
+generated
package-lock.json
package.json
webpack.config.js
diff --git a/incubator/viewers/vaadin/ui/.gitignore b/incubator/viewers/vaadin/ui/.gitignore
deleted file mode 100644
index c280815873..0000000000
--- a/incubator/viewers/vaadin/ui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/frontend/
diff --git a/incubator/viewers/vaadin/ui/frontend/index.html b/incubator/viewers/vaadin/ui/frontend/index.html
new file mode 100644
index 0000000000..a5cdd4018a
--- /dev/null
+++ b/incubator/viewers/vaadin/ui/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+ <meta charset="UTF-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <style>
+ body, #outlet {
+ height: 100vh;
+ width: 100%;
+ margin: 0;
+ }
+ </style>
+ <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+ <!-- This outlet div is where the views are rendered -->
+ <div id="outlet"></div>
+</body>
+</html>
diff --git a/incubator/viewers/vaadin/ui/src/main/resources/static/frontend/index.html b/incubator/viewers/vaadin/ui/src/main/resources/static/frontend/index.html
new file mode 100644
index 0000000000..a5cdd4018a
--- /dev/null
+++ b/incubator/viewers/vaadin/ui/src/main/resources/static/frontend/index.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<!--
+This file is auto-generated by Vaadin.
+-->
+
+<html lang="en">
+<head>
+ <meta charset="UTF-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <style>
+ body, #outlet {
+ height: 100vh;
+ width: 100%;
+ margin: 0;
+ }
+ </style>
+ <!-- index.ts is included here automatically (either by the dev server or during the build) -->
+</head>
+<body>
+ <!-- This outlet div is where the views are rendered -->
+ <div id="outlet"></div>
+</body>
+</html>