zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-08-05 17:28:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Clean up the Gradle JS distribution a bit

Browse source 
There's no reason not to always create the source mapping but we shouldn't
distribute it in production.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=233984970
This commit is contained in:
gbrodman 2019-02-14 10:39:51 -08:00 • committed by jianglai
parent 4241c7658f
commit 063197fd69
2 changed files with 33 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
gradle/build.gradle
View file

@ -262,12 +262,10 @@ subprojects {
if (project.path == ":services:default") {
war {
from("${coreResourcesDir}/google/registry/ui") {
include "registrar_bin*"
into("assets/js")
rename { String filename -> filename.replace("bin", "dbg") }
}
from("${coreResourcesDir}/google/registry/ui") {
include "registrar_bin*"
include "registrar_bin.js"
if (environment != "production") {
include "registrar_bin.js.map"
}
into("assets/js")
}
from("${coreResourcesDir}/google/registry/ui/css") {

46
gradle/core/build.gradle
View file

@ -363,7 +363,6 @@ task soyToJava {
}
doLast {
soyToJava('google.registry.tools.soy',
"${generatedDir}/${toolsSoyDir}",
fileTree(
@ -393,6 +392,11 @@ task soyToJava {
}
task soyToJS {
def rootSoyDirectory = "${javaDir}/google/registry/ui/soy"
def outputSoyDirectory = "${generatedDir}/google/registry/ui/soy"
inputs.dir rootSoyDirectory
outputs.dir outputSoyDirectory
ext.soyToJS = { outputDirectory, soyFiles , deps->
javaexec {
main = "com.google.template.soy.SoyToJsSrcCompiler"
@ -410,13 +414,13 @@ task soyToJS {
doLast {
def rootSoyFiles =
fileTree(
dir: "${javaDir}/google/registry/ui/soy",
dir: "${rootSoyDirectory}",
include: ['*.soy'])
soyToJS("${generatedDir}/google/registry/ui/soy", rootSoyFiles, "")
soyToJS("${generatedDir}/google/registry/ui/soy/registrar",
soyToJS("${outputSoyDirectory}", rootSoyFiles, "")
soyToJS("${outputSoyDirectory}/registrar",
files {
file("${javaDir}/google/registry/ui/soy/registrar").listFiles()
file("${rootSoyDirectory}/registrar").listFiles()
}.filter {
it.name.endsWith(".soy")
}.filter{
@ -477,17 +481,25 @@ task stylesheetsToJavascript {
}
task compileProdJS(type: JavaExec) {
// TODO(b/123647609) clean this up in general
// - have two separate tasks for dev/prod
// - the prod task uses the ADVANCED_OPTIMIZATION flag.
// - have this be a configurable task so we can change the inputs/outputs
def outputDir = "${resourcesDir}/google/registry/ui"
def nodeModulesDir = "${rootDir}/node_modules"
def cssSourceDir = "${resourcesDir}/google/registry/ui/css"
def jsSourceDir = "${javaDir}/google/registry/ui/js"
def externsDir = "${javaDir}/google/registry/ui/externs"
def soySourceDir = "${generatedDir}/google/registry/ui/soy"
[nodeModulesDir, cssSourceDir, jsSourceDir, externsDir, soySourceDir].each {
inputs.dir "${it}"
}
outputs.dir outputDir
classpath configurations.closureCompiler
main = 'com.google.javascript.jscomp.CommandLineRunner'
def closureArgs = []
closureArgs << "--js_output_file=${resourcesDir}/google/registry/ui/registrar_bin.js"
closureArgs << "--js_output_file=${outputDir}/registrar_bin.js"
// sourcemap-related configuration
closureArgs << "--create_source_map=${resourcesDir}/google/registry/ui/registrar_bin.js.map"
closureArgs << "--create_source_map=${outputDir}/registrar_bin.js.map"
closureArgs << "--source_map_include_content=true"
closureArgs << "--source_map_location_mapping=${rootDir}/|"
closureArgs << "--output_wrapper=\"%output% //# sourceMappingURL=registrar_bin.js.map\""
@ -498,13 +510,13 @@ task compileProdJS(type: JavaExec) {
closureArgs << "--generate_exports"
// manually include all the required js files
closureArgs << "--js=${rootDir}/node_modules/google-closure-library/**.js"
closureArgs << "--js=${rootDir}/node_modules/soyutils_usegoog.js"
closureArgs << "--js=${resourcesDir}/google/registry/ui/css/registrar_bin.css.js"
closureArgs << "--js=${javaDir}/google/registry/ui/js/**.js"
closureArgs << "--js=${nodeModulesDir}/google-closure-library/**.js"
closureArgs << "--js=${nodeModulesDir}/soyutils_usegoog.js"
closureArgs << "--js=${cssSourceDir}/registrar_bin.css.js"
closureArgs << "--js=${jsSourceDir}/**.js"
// TODO(shicong) Verify the compiled JS file works in Alpha
closureArgs << "--js=${javaDir}/google/registry/ui/externs/json.js"
closureArgs << "--js=${generatedDir}/google/registry/ui/soy/**.js"
closureArgs << "--js=${externsDir}/json.js"
closureArgs << "--js=${soySourceDir}/**.js"
args closureArgs
}