1817 improve build system

.editorconfig

@@ -12,3 +12,7 @@ indent_style = space
 
 [{*.less,package.json,*.yml}]
 indent_size = 2
+
+[tsup/*.ts]
+indent_size = 4
+indent_style = tab

.eslintrc.js

@@ -1,8 +1,12 @@
 module.exports = {
     extends: '@enonic/eslint-config',
     parserOptions: {
-        project: './tsconfig.json',
-        tsconfigRootDir: __dirname,
+        project: [
+            './src/main/resources/tsconfig.json',
+            './src/main/resources/_static/tsconfig.json',
+            './src/test/resources/tsconfig.json',
+        ],
+        // tsconfigRootDir: __dirname,
     },
     'rules': {
         'new-cap': ['warn', {'capIsNewExceptions': ['Q']}],

.github/workflows/gradle.yml

@@ -41,6 +41,12 @@ jobs:
         with:
           ref: ${{ github.event.client_payload.ref || github.ref }}
 
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: 11
+          distribution: 'temurin'
+
       - uses: actions/cache@v3
         with:
           path: |

build.gradle

@@ -38,10 +38,13 @@ dependencies {
     include "com.enonic.xp:lib-node:${xpVersion}"
     include "com.enonic.xp:lib-auth:${xpVersion}"
     include "com.enonic.xp:lib-i18n:${xpVersion}"
+    include "com.enonic.xp:lib-io:${xpVersion}"
     include "com.enonic.lib:lib-admin-ui:${libAdminUiVersion}"
     devResources "com.enonic.lib:lib-admin-ui:${libAdminUiVersion}"
-    include "com.enonic.lib:lib-graphql:2.0.1"
+    include "com.enonic.lib:lib-graphql:2.1.0"
     include "com.enonic.lib:lib-mustache:2.1.0"
+    include 'com.enonic.lib:lib-router:3.1.0'
+    include 'com.enonic.lib:lib-static:1.0.3'
 
     testImplementation "com.enonic.xp:testing:${xpVersion}"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.1'
@@ -62,42 +65,83 @@ repositories {
     xp.enonicRepo( 'dev' )
 }
 
+tasks.register('npmCheck', NpmTask) {
+	dependsOn( 'npmInstall' )
+	args = [
+		'run',
+		'check:types'
+	]
+	environment = [
+		'FORCE_COLOR': 'true',
+	]
+}
+
+tasks.withType(Copy).configureEach {
+    includeEmptyDirs = false
+}
+
 tasks.register('lint', NpmTask) {
     dependsOn ( 'npmInstall' )
     group "verification"
     args = ['run', 'lint']
     outputs.upToDateWhen { false }
 }
 
-check.dependsOn lint
+check.dependsOn( 'lint', 'npmCheck' )
 
-tasks.register('webpack', NpmTask) {
+tasks.register('npmBuild', NpmTask) {
     dependsOn( 'npmInstall' )
-    environment = ['NODE_ENV': nodeEnvironment()]
+    environment = [
+        'FORCE_COLOR': 'true',
+        'LOG_LEVEL_FROM_GRADLE': gradle.startParameter.logLevel.toString(),
+        'NODE_ENV': nodeEnvironment()
+    ]
     description = 'Build UI resources (ts, css, etc).'
-    args = ['run', 'build']
+    args = ['run', '--silent', 'build']
     inputs.dir '.xp/dev'
-    inputs.dir 'src/main/resources/assets'
-    inputs.file 'webpack.config.js'
+    inputs.dir 'src/main/resources'
     outputs.dir "$buildDir/build/resources/main"
+    inputs.file 'tsup.config.ts'
 }
 
-jar {
-    exclude 'assets/**/*.ts'
-    exclude 'assets/**/*.less'
-    exclude 'assets/styles/*.js'
+tasks.register('npmBuildTests', NpmTask) {
+    dependsOn( 'npmBuild', 'processTestResources' )
+    environment = [
+        'FORCE_COLOR': 'true',
+        'LOG_LEVEL_FROM_GRADLE': gradle.startParameter.logLevel.toString(),
+        'NODE_ENV': nodeEnvironment()
+    ]
+    description = 'Build tests'
+    args = ['run', '--silent', 'build:tests']
+    inputs.dir 'src/test/resources'
+    outputs.dir "$buildDir/build/resources/test"
+    inputs.file 'tsup.config.ts'
+}
+
+processResources {
+    exclude '**/*.ts'
+    exclude 'assets/**/*.less' // lessc and postcss will handle this
+    exclude 'assets/**/*.woff' // postcss-url will copy
+    exclude 'assets/**/*.woff2' // postcss-url will copy
 
     if ( isProd() )
     {
         exclude 'assets/**/*.map'
     }
+}
 
-    outputs.dir "$buildDir/resources/main"
+processTestResources {
+    exclude '**/*.ts'
+}
 
-    dependsOn( 'webpack', 'javadoc', 'test' )
+jar {
+    outputs.dir "$buildDir/resources/main"
+    dependsOn( 'npmBuild', 'javadoc', 'test' )
 }
 
 test {
+    dependsOn( 'npmBuildTests' )
+
     useJUnitPlatform()
     systemProperty 'java.awt.headless', 'true'
     jvmArgs '-noverify', '-XX:TieredStopAtLevel=1'

gradle.properties

@@ -2,6 +2,6 @@
 # Project settings
 #
 version=7.14.0-SNAPSHOT
-libAdminUiVersion=4.9.0-SNAPSHOT
+libAdminUiVersion=4.9.0-3266-SNAPSHOT
 systemProp.org.gradle.internal.http.connectionTimeout=120000
 systemProp.org.gradle.internal.http.socketTimeout=120000

gradle/node.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.github.node-gradle.node'
 
 node {
-    version = '18.17.1'
+    version = '18.18.1'
     download = true
 }