@genesislcap/blank-app-seed 1.5.4 → 2.0.0

package/.genx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed-config",
   "description": "Genesis Blank App Seed Configuration",
-  "version": "1.5.4",
+  "version": "2.0.0",
   "license": "Apache-2.0",
   "genxSeedConfig": {
     "exclude": [

package/.genx/prompts/server.js

@@ -3,7 +3,8 @@ const {mavenArtifactVersionRegex} = require('./validators');
 module.exports = async (inquirer, prevAns = {}) => {
     const {
       groupId = prevAns.groupId,
-      applicationVersion = prevAns.applicationVersion
+      applicationVersion = prevAns.applicationVersion,
+      enableDeployPlugin = prevAns.enableDeployPlugin
     } = await inquirer.prompt([
       {
         name: 'groupId',
@@ -20,9 +21,17 @@ module.exports = async (inquirer, prevAns = {}) => {
         default:'1.0.0-SNAPSHOT',
         validate: mavenArtifactVersionRegex
       },
+      {
+        name: 'enableDeployPlugin',
+        type: 'confirm',
+        message: 'Enable deploy plugin?',
+        when: prevAns.enableDeployPlugin === undefined,
+        default: prevAns.enableDeployPlugin || false
+      },
     ]);
     return {
       groupId,
       applicationVersion,
+      enableDeployPlugin,
     };
   };

package/.genx/prompts.js

@@ -11,12 +11,13 @@ module.exports = async (inquirer, prevAns = {}) => {
   License: ${license}`);
 
   const {apiHost, enableSSO} = await apiPrompts(inquirer, prevAns)
-  const {groupId, applicationVersion} = await genesisServerPrompts(inquirer, prevAns);
+  const {groupId, applicationVersion, enableDeployPlugin} = await genesisServerPrompts(inquirer, prevAns);
 
   return {
     apiHost,
     enableSSO,
     groupId,
     applicationVersion,
+    enableDeployPlugin,
   };
 };

package/.genx/tests/fixtures/testapp/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     tty: true
     container_name: gsf
     build:
-      context: server/jvm/testapp-deploy/build/docker/
+      context: server/testapp-app/build/docker/
       dockerfile: Dockerfile
     networks:
       qs_network:

package/.genx/versions.json

@@ -1,5 +1,5 @@
 {
-  "UI": "14.137.1",
-  "GSF": "7.0.7",
-  "Auth": "7.0.1"
+  "UI": "14.148.0",
+  "GSF": "7.1.7",
+  "Auth": "7.1.3"
 }

package/.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # for reference see https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-code-owners#example-of-a-codeowners-file
 
-* @cistov @derekdon @MrBrunoWolff @skawian @kievitsp @jacinpoz
+* @cistov @derekdon @MrBrunoWolff @skawian @kievitsp @jacinpoz @khouari1

package/.github/workflows/build.yml

@@ -2,7 +2,6 @@ name: Build
 
 on:
   push:
-    branches: [main, master, develop, alpha]
   pull_request:
     branches: [main, master, develop, alpha]
   workflow_dispatch:
@@ -37,7 +36,7 @@ jobs:
 
       - name: Generate sample app
         working-directory: /tmp
-        run: npx -y @genesislcap/genx@latest init testapp -s "${{github.workspace}}" -x
+        run: npx -y @genesislcap/genx@latest init testapp -s "${{github.workspace}}" -x --enableDeployPlugin
 
       - name: Copy fixtures
         run: cp -R ./.genx/tests/fixtures/testapp/* /tmp/testapp
@@ -60,7 +59,7 @@ jobs:
 
       - name: Create Server Dockerfile
         working-directory: /tmp/testapp
-        run: ./gradlew :genesisproduct-testapp:testapp-deploy:createDockerfile
+        run: ./gradlew :server:testapp-app:createDockerfile -PclientSpecific=true
 
       - name: Build Docker images
         working-directory: /tmp/testapp

package/.github/workflows/release.yml

@@ -26,7 +26,10 @@ jobs:
           npm run release
 
       - name: Generate .npmignore
-        run: cp .gitignore .npmignore && echo '\n!.gitignore' >> .npmignore
+        run: cp .gitignore .npmignore && echo '!.gitignore' >> .npmignore && cat .npmignore
+
+      - name: NPM pack dry-run
+        run: npm pack -dry
 
       - name: Publish
         uses: JS-DevTools/npm-publish@v3

package/.gitignore

@@ -0,0 +1,107 @@
+# Root and server specific
+
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Output of 'npm pack'
+*.tgz
+
+# dotenv environment variables file
+.env
+.env.*
+
+# Editor directories and files
+.idea
+.vscode
+!.vscode/settings.json
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+.DS_Store
+
+# Development
+target/
+.settings/
+.project
+.classpath
+*.ignore
+*.iml
+*~
+.gradle
+**/build/
+!src/**/build/
+client/bootstrapDone
+.husky/.gitignore
+build-cache/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# Dependency directories
+node_modules
+
+# Intellij plugin folder
+.genesis-home
+
+# Client
+
+# Logs
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Output
+client/dist/
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+client/lib-cov
+
+# Coverage directory used by tools like istanbul
+client/coverage
+
+# Coverage files
+coverage.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# lerna backups
+package.json.lerna_backup
+
+# custom elements metadata
+custom-elements.json
+
+# TypeScript incremental compilation cache
+*.tsbuildinfo
+.rollup.cache
+
+# User files that may contain sensitive tokens etc.
+.npmrc
+
+# Gradle tasks
+.bootstrapDone
+.tests.executed

package/.releaserc

@@ -73,4 +73,4 @@
       }
     ]
   ]
-}
+}

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [2.0.0](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v1.5.5...v2.0.0) (2024-03-07)
+
+
+### ⚠ BREAKING CHANGES
+
+* simplified server folder structure
+
+### Features
+
+* simplified server folder structure (DVOP-620) (#133) 17a58c4
+
+## [1.5.5](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v1.5.4...v1.5.5) (2024-02-01)
+
+
+### Bug Fixes
+
+* ensure .gitignore is included in NPM artifact [PSD-47](https://github.com/genesiscommunitysuccess/blank-app-seed/issues/47) (#124) c9e2d78
+
 ## [1.5.4](https://github.com/genesiscommunitysuccess/blank-app-seed/compare/v1.5.3...v1.5.4) (2024-02-01)
 
 

package/build.gradle.kts

@@ -12,4 +12,4 @@ tasks {
             }
         }
     }
-}
+}

package/client/package.json

@@ -68,12 +68,16 @@
   },
   "prettier": "@genesislcap/prettier-config",
   "devDependencies": {
-    "@genesiscommunitysuccess/cep-fast-plugin": "4.1.1",
-    "@genesiscommunitysuccess/custom-elements-lsp": "4.1.1",
+    "@genesiscommunitysuccess/cep-fast-plugin": "5.0.3",
+    "@genesiscommunitysuccess/custom-elements-lsp": "5.0.3",
     "@genesislcap/design-system-configurator": "{{versions.UI}}",
     "@genesislcap/eslint-config": "{{versions.UI}}",
     "@genesislcap/foundation-testing": "{{versions.UI}}",
     "@genesislcap/genx": "{{versions.UI}}",
+    "@genesislcap/eslint-stylelint-builder": "{{versions.UI}}",
+    "@genesislcap/uvu-playwright-builder": "{{versions.UI}}",
+    "@genesislcap/vite-builder": "{{versions.UI}}",
+    "@genesislcap/webpack-builder": "{{versions.UI}}",
     "@genesislcap/prettier-config": "{{versions.UI}}",
     "@genesislcap/stylelint-config": "{{versions.UI}}",
     "@types/node": "20.11.5",

package/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     tty: true
     container_name: gsf
     build:
-      context: server/jvm/{{appName}}-deploy/build/docker/
+      context: server/{{appName}}-app/build/docker/
       dockerfile: Dockerfile
     networks:
       qs_network:
@@ -15,16 +15,6 @@ services:
       - '1337:22'
       - '5432:5432'
       - '4569:4569'
-  nginx-proxy:
-    ports:
-      - '80:80'
-      - '443:443'
-    container_name: nginx
-    build:
-      context: server/nginx/
-      dockerfile: Dockerfile
-    networks:
-      - qs_network
   frontend:
     container_name: frontend
     build:

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/gradle.properties

@@ -1,3 +1,3 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx6g -Xss512k -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC -XX:+UseStringDeduplication -XX:ReservedCodeCacheSize=512m -Dkotlin.daemon.jvm.options=-Xmx2g -Dfile.encoding=UTF-8
-org.gradle.caching=true
+org.gradle.caching=true

package/gradlew

@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/blank-app-seed",
   "description": "Genesis Blank App Seed",
-  "version": "1.5.4",
+  "version": "2.0.0",
   "license": "Apache-2.0",
   "scripts": {
     "release": "semantic-release"

package/server/README.md

@@ -0,0 +1,13 @@
+# Genesis Product Server
+
+## Project structure
+
+The blank-app-seed project has now been converted to a Simplified project structure and the old project structure is now referred to as Legacy.
+The {{appName}}-app module is the server's main module and, as a minimum, is the only one required.
+All of the project's server code can be put in this module including configuration files, GPAL scripts and other Java/Kotlin code.
+
+By default, the main module will be detected by a module ending with -app. 
+You can use the Genesis Gradle Settings plugin property `mainModuleName` to specify a custom name.
+The Genesis Settings plugin is configured in server/settings.gradle.kts with the `genesis` extension.
+
+For more details on project structures, see the [docs](https://learn.genesis.global/docs/operations/project-structure/introduction/).

package/server/{jvm/build.gradle.kts → build.gradle.kts}

@@ -1,25 +1,12 @@
 ext.set("localDaogenVersion", "{{localGenId}}")
 
 plugins {
-    kotlin("jvm") version "1.9.10"
     `maven-publish`
-    id("global.genesis.build")
 }
 
-subprojects  {
-    apply(plugin = "org.jetbrains.kotlin.jvm")
+subprojects {
     apply(plugin = "org.gradle.maven-publish")
 
-    val junitVersion = "5.10.0"
-    dependencies {
-        implementation(platform("global.genesis:genesis-bom:${properties["genesisVersion"]}"))
-        testImplementation(kotlin("test"))
-        constraints {
-            // define versions of your dependencies here so that submodules do not have to define versions
-            testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
-            testImplementation("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
-        }
-    }
     tasks {
         withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
             kotlinOptions {

package/server/{jvm/gradle → gradle}/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/server/gradle.properties

@@ -0,0 +1,15 @@
+bundleGeneratedClasses=true
+org.gradle.jvmargs=-Xmx6g -Xss512k -XX:+HeapDumpOnOutOfMemoryError -XX:+UseG1GC -XX:+UseStringDeduplication -XX:ReservedCodeCacheSize=512m -Dkotlin.daemon.jvm.options=-Xmx2g -Dfile.encoding=UTF-8
+enableDockerTasks=true
+dockerCompactProcesses=true
+genesisVersion={{ versions.GSF }}
+authVersion={{ versions.Auth }}
+
+# Default ssh config for the docker dev environment
+genesis-home=/app/run
+ssh-username=genesis
+ssh-password=genesis
+ssh-host=localhost
+ssh-port=1337
+
+enableDockerContainerTasks=true

package/server/{jvm/gradlew → gradlew}

@@ -145,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +202,11 @@ fi
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
-# Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
-#     and any embedded shellness will be escaped.
-#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
-#     treated as '${Hostname}' itself on the command line.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

package/server/{jvm/settings.gradle.kts → settings.gradle.kts}

@@ -1,29 +1,15 @@
 rootProject.name = "genesisproduct-{{appName}}"
 
-buildCache {
-    local {
-        directory = File(rootDir.parentFile.parent, "build-cache")
-        removeUnusedEntriesAfterDays = 30
-        isEnabled = true
-    }
-}
-
 pluginManagement {
     pluginManagement {
         val genesisVersion: String by settings
-        val deployPluginVersion: String by settings
+
         plugins {
-            id("global.genesis.build") version genesisVersion
-            id("global.genesis.deploy") version deployPluginVersion
+            id("global.genesis.settings") version genesisVersion
         }
     }
+
     repositories {
-        mavenLocal {
-            // VERY IMPORTANT!!! EXCLUDE AGRONA AS IT IS A POM DEPENDENCY AND DOES NOT PLAY NICELY WITH MAVEN LOCAL!
-            content {
-                excludeGroup("org.agrona")
-            }
-        }
         mavenCentral()
         gradlePluginPortal()
         maven {
@@ -38,23 +24,30 @@ pluginManagement {
                 password = extra.properties["genesisArtifactoryPassword"].toString()
             }
         }
+        mavenLocal {
+            // VERY IMPORTANT!!! EXCLUDE AGRONA AS IT IS A POM DEPENDENCY AND DOES NOT PLAY NICELY WITH MAVEN LOCAL!
+            content {
+                excludeGroup("org.agrona")
+            }
+        }
     }
 }
 
+plugins {
+    id("global.genesis.settings")
+}
+
+genesis {
+    dependencies {
+        dependency("global.genesis:auth:${extra.properties["authVersion"]}")
+
+    }
+
+    plugins {
+        genesisDeploy.enabled = {{ enableDeployPlugin }}
+    }
 
+}
 
-include("{{appName}}-config")
-include("{{appName}}-messages")
-include("{{appName}}-eventhandler")
-include("{{appName}}-script-config")
-include("{{appName}}-distribution")
-include("{{appName}}-dictionary-cache")
-include("{{appName}}-dictionary-cache:{{appName}}-generated-sysdef")
-include("{{appName}}-dictionary-cache:{{appName}}-generated-fields")
-include("{{appName}}-dictionary-cache:{{appName}}-generated-dao")
-include("{{appName}}-dictionary-cache:{{appName}}-generated-hft")
-include("{{appName}}-dictionary-cache:{{appName}}-generated-view")
-include("{{appName}}-deploy")
-include("{{appName}}-site-specific")
 
-includeBuild("../../client")
+include("{{appName}}-app")

package/server/{{appName}}-app/build.gradle.kts

@@ -0,0 +1,20 @@
+dependencies {
+    compileOnly(genesis("script-dependencies"))
+    genesisGeneratedCode(withTestDependency = true)
+}
+
+description = "{{appName}}-app"
+
+sourceSets {
+    main {
+        resources {
+            srcDirs("src/main/resources", "src/main/genesis")
+        }
+    }
+}
+
+tasks {
+    copyDependencies {
+        enabled = false
+    }
+}

package/server/{jvm/{{appName}}-site-specific/src/main/resources → {{appName}}-app/src/main/genesis}/cfg/genesis-system-definition.kts

@@ -1,22 +1,19 @@
-package genesis.cfg
-
 systemDefinition {
     global {
-        item(name = "DEPLOYED_PRODUCT", value = "{{appName}}")
-        item(name = "MqLayer", value = "ZeroMQ")
-        {{#if useDocker}}
         item(name = "DbLayer", value = "SQL")
-        item(name = "DbHost", value = "jdbc:postgresql://localhost:5432/?user=postgres&password=postgres")
-        {{else}}
-        item(name = "DbLayer", value = "FDB")
-        item(name = "DbHost", value = "localhost")
-        {{/if}}
+        item(name = "DbHost", value = "jdbc:postgresql://localhost:5432/?user=postgres&password=docker")
+        item(name = "DEPLOYED_PRODUCT", value = "{{appName}}")
+        item(name = "MqLayer", value = env["MQ_LAYER", "ZeroMQ"])
+
         item(name = "DictionarySource", value = "DB")
         item(name = "AliasSource", value = "DB")
         item(name = "HookStateStore", value = "DB")
         item(name = "MetricsEnabled", value = "false")
         item(name = "ZeroMQProxyInboundPort", value = "5001")
         item(name = "ZeroMQProxyOutboundPort", value = "5000")
+        env["DB_USERNAME"].takeIf { it.isNotBlank() }?.let { item(name = "DbUsername", value = it) }
+        env["DB_PASSWORD"].takeIf { it.isNotBlank() }?.let { item(name = "DbPassword", value = it) }
+        env["DB_SQL_CONNECTION_POOL_SIZE"].takeIf { it.isNotBlank() }?.let { item(name = "DbSqlConnectionPoolSize", value = it) }
         item(name = "DbMode", value = "VANILLA")
         item(name = "GenesisNetProtocol", value = "V2")
         item(name = "ResourcePollerTimeout", value = "5")
@@ -25,11 +22,11 @@ systemDefinition {
         item(name = "MetadataChronicleMapAverageValueSizeBytes", value = "1024")
         item(name = "MetadataChronicleMapEntriesCount", value = "512")
         item(name = "DaemonServerPort", value = "4568")
+        item(name = "DaemonHealthPort", value = "4569")
         item(
             name = "JVM_OPTIONS",
             value = "-XX:MaxHeapFreeRatio=70 -XX:MinHeapFreeRatio=30 -XX:+UseG1GC -XX:+UseStringDeduplication -XX:OnOutOfMemoryError=\"handleOutOfMemoryError.sh %p\""
         )
-        item(name = "DaemonHealthPort", value = "4569")
     }
 
     systems {