wip #1098 All ts code built with tsup

.eslintignore

@@ -1,7 +1,8 @@
-node_modules/
-build/
-dist/
-.xp/
+/build/
+/dist/
+/node_modules/
+/tsup/
+/.xp/
 **/*.js
 **/*.d.ts
 **/spec/**

.eslintrc.js

@@ -1,7 +1,10 @@
 module.exports = {
   extends: '@enonic/eslint-config',
   parserOptions: {
-    project: 'tsconfig.json',
+    project: [
+      './src/main/resources/tsconfig.json',
+      './src/main/resources/_static/tsconfig.json'
+    ],
     tsconfigRootDir: __dirname,
   },
   'rules': {

.gitignore

@@ -1,3 +1,4 @@
+/.enonic
 .DS_Store
 build/
 temp/

.nvmrc

@@ -0,0 +1 @@
+18.18.2

build.gradle

@@ -3,7 +3,7 @@ plugins {
     id 'maven-publish'
     id 'com.enonic.defaults' version '2.1.2'
     id 'com.enonic.xp.app' version '3.4.0'
-    id "com.github.node-gradle.node" version '7.0.0'
+    id 'com.github.node-gradle.node' version '7.0.1'
 }
 
 apply from: "$rootDir/gradle/env.gradle"
@@ -45,13 +45,18 @@ app {
 }
 
 dependencies {
-    include "com.enonic.xp:lib-portal:${xpVersion}"
+    include "com.enonic.xp:lib-admin:${xpVersion}"
     include "com.enonic.xp:lib-content:${xpVersion}"
     include "com.enonic.xp:lib-i18n:${xpVersion}"
-    include "com.enonic.xp:lib-admin:${xpVersion}"
+    include "com.enonic.xp:lib-io:${xpVersion}"
+    include "com.enonic.xp:lib-portal:${xpVersion}"
+
     include "com.enonic.lib:lib-admin-ui:${libAdminUiVersion}"
     include "com.enonic.lib:lib-contentstudio:${libContentStudioVersion}"
     include "com.enonic.lib:lib-mustache:${libMustacheVersion}"
+    include 'com.enonic.lib:lib-router:3.1.0'
+    include 'com.enonic.lib:lib-static:1.0.3'
+
     devResources "com.enonic.lib:lib-admin-ui:${libAdminUiVersion}"
     devResources "com.enonic.lib:lib-contentstudio:${libContentStudioVersion}"
 }
@@ -68,7 +73,7 @@ configurations.all {
 
 node {
     download = true
-    version = '18.17.1'
+    version = '18.18.2'
 }
 
 tasks.register('copyDevResources') {
@@ -83,6 +88,17 @@ tasks.register('copyDevResources') {
 
 npmInstall.dependsOn copyDevResources
 
+tasks.register('npmCheck', NpmTask) {
+    dependsOn( 'npmInstall' )
+    args = [
+            'run',
+            'check:types'
+    ]
+    environment = [
+            'FORCE_COLOR': 'true',
+    ]
+}
+
 tasks.register('lint', NpmTask) {
     dependsOn npmInstall
     args = [ 'run', 'lint:quiet' ]
@@ -92,20 +108,30 @@ tasks.register('lint', NpmTask) {
 }
 
 check.configure {
-    dependsOn( 'lint' )
+    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' ]
     inputs.dir '.xp/dev'
     inputs.dir 'src/main'
+    inputs.dir 'tsup'
+    inputs.file 'tsup.config.ts'
     inputs.file 'webpack.config.js'
     outputs.dir "${buildDir}/resources/main"
 }
 
+processResources {
+    exclude '**/*.ts'
+}
+
 jar {
     exclude 'assets/**/*.ts'
     exclude 'assets/**/*.less'
@@ -117,7 +143,7 @@ jar {
         exclude 'assets/**/*.map'
     }
 
-    dependsOn( 'webpack' )
+    dependsOn( 'npmBuild' )
 }
 
 if ( hasEnvironment() )

gradle.properties

@@ -7,7 +7,7 @@ appName=com.enonic.app.contentstudio.plus
 
 libMustacheVersion=2.1.0
 xpVersion=7.13.0
-libAdminUiVersion=4.9.0-SNAPSHOT
+libAdminUiVersion=4.9.0-3266-SNAPSHOT
 libContentStudioVersion=5.2.0-SNAPSHOT
 
 version=1.7.0-SNAPSHOT