TAP5-2804: Convert Tapestry JavaScript sources from CoffeeScript to TypeScript

5_10_RELEASE_NOTES.md

@@ -2,7 +2,7 @@ Scratch pad for changes destined for the 5.10.0 release notes page.
 
 # Added configuration symbols
 
-* `tapestry.es-module-path-prefix` (`SymbolConstants.ES_MODULE_PATH_PREFIX`)
+* `tapestry.require-js-enabled`(`SymbolConstants.REQUIRE_JS_ENABLED`) (default value: `code`false).
 
 
 # Added methods
@@ -20,5 +20,13 @@ Scratch pad for changes destined for the 5.10.0 release notes page.
 
 # Non-backward-compatible changes (but that probably won't cause problems)
 
+# Non-backward-compatible changes
+
+When using Require.js and AMD modules, from Tapestry 5.10.0 on,
+the previously returned objects, functions or values are now
+the `default` property of the object received from `require()`.
+This is a consequence we couldn't avoid from the CoffeeScript
+to JavaScript to TypeScript conversion.
+
 
 # Overall notes

build.gradle

@@ -500,29 +500,12 @@ task aggregateJavadoc(type: Javadoc) {
     }
 }
 
-task coffeeScriptDocs(type: Exec) {
+task typeScriptDocs() {
     group "Documentation"
-    description "Build docco documentation for all CoffeeScript sources"
-    dependsOn project(":tapestry-core").tasks.preprocessCoffeeScript
-
-    def outputDir = file("$buildDir/documentation/coffeescript")
-
-    def sources = files()
-
-    subprojects.each { sub ->
-        sources += sub.fileTree("src/main/coffeescript", { include "**/*.coffee" })
-    }
-
-    sources += project(":tapestry-core").tasks.preprocessCoffeeScript.outputs.files.asFileTree
-
-    // Needs to be installed via "npm install -g docco@0.6.3"
-    executable isWindows() ? "docco.cmd" : "docco"
-    args "--output", outputDir
-    args sources.files.sort({ a, b -> a.name.compareTo b.name })
+    description "Builds typedoc documentation for all TypeScript sources"
+    dependsOn project(":tapestry-core").tasks.generateTypeScriptDocs
 }
 
-
-
 dependencies {
     if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
         meta aggregateJavadoc.outputs.files
@@ -556,7 +539,11 @@ task combinedJacocoReport(type:JacocoReport){
 
 task continuousIntegration {
     // tapestry-javadoc doesn't work with Java 8 anymore. That's why it's only added if != 8.
-    def dependants = [subprojects.build, 'tapestry-core:testWithPrototype', combinedJacocoReport]
+    def dependants = [subprojects.build, // jQuery and Require.js enabled
+//            'tapestry-core:testWithJqueryAndRequireJsDisabled',
+//            'tapestry-core:testWithPrototypeAndRequireJsEnabled', 
+            'tapestry-core:testWithPrototypeAndRequireJsDisabled',
+            combinedJacocoReport]
     if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
         dependants << aggregateJavadoc
     }
@@ -568,9 +555,7 @@ task zippedSources(type: Zip) {
     description "Creates a combined Zip file of all sub-project's sources"
     group "Release artifact"
 
-    dependsOn("tapestry-beanvalidator:compileCoffeeScript")
-    dependsOn("tapestry-core:compileCoffeeScript")
-    dependsOn("tapestry-core:compileProcessedCoffeescript")
+    dependsOn("tapestry-core:compileTypeScript")
 
     destinationDirectory = buildDir
     archiveBaseName = "apache-tapestry"
@@ -587,11 +572,14 @@ task zippedSources(type: Zip) {
     exclude "**/target/**"
     exclude "**/build/**"
     exclude "**/test-output/**"  // Left around by TestNG sometimes
+    exclude "**/modules/***.js"
+    exclude "**/es-modules/***.js"
 }
 
 task zippedApidoc(type: Zip) {
+    dependsOn typeScriptDocs
     dependsOn aggregateJavadoc
-    description "Zip archive of the project's aggregate JavaDoc and CoffeeScript documentation"
+    description "Zip archive of the project's aggregate JavaDoc and TypeScript documentation"
     group "Release artifact"
 
     destinationDirectory = buildDir
@@ -611,7 +599,7 @@ task zippedApidoc(type: Zip) {
     into "apidocs", { from aggregateJavadoc.outputs.files }
 
 
-    into "coffeescript", { from coffeeScriptDocs.outputs.files }
+    into "typescript", { from typeScriptDocs.outputs.files }
 
 }
 

settings.gradle

@@ -31,7 +31,7 @@ buildCache {
     }
 }
 
-rootProject.name = "tapestry"
+rootProject.name = "tapestry-5"
 
 include "plastic", "tapestry5-annotations", "tapestry-test", "tapestry-func", "tapestry-ioc", "tapestry-json", "tapestry-http", "tapestry-core"
 include "tapestry-hibernate-core", "tapestry-hibernate", "tapestry-jmx", "tapestry-upload"

tapestry-beanvalidator/build.gradle

@@ -17,23 +17,11 @@ dependencies {
 
 }
 
-task compileCoffeeScript(type: CompileCoffeeScript) {
-    outputDir "src/main/generated/compiled-coffeescript"
-}
-
 // Start up the test app, useful when debugging failing integration tests
 task runTestApp303(type:JavaExec) {
   main = 'org.apache.tapestry5.test.JettyRunner'
   args "-d", "src/test/webapp", "-p", "8080"
   classpath += project.sourceSets.test.runtimeClasspath
 }
 
-clean.delete 'src/main/generated'
-
-sourceSets {
-    main {
-        output.dir(compileCoffeeScript.outputDir, builtBy: compileCoffeeScript)
-    }
-}
-
 jar.manifest.attributes 'Tapestry-Module-Classes': 'org.apache.tapestry5.beanvalidator.modules.BeanValidatorModule'