Move JS and CSS files to a Javascript source dir (#156)

This commit is contained in:
gbrodman 2019-07-05 12:01:16 -04:00 committed by GitHub
parent 75c3792c4b
commit 153887df11
43 changed files with 8 additions and 17 deletions

View file

@ -25,6 +25,7 @@ def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens"
def newGoldensDir = "${project.buildDir}/new_golden_images" def newGoldensDir = "${project.buildDir}/new_golden_images"
def goldensDir = def goldensDir =
"${javaTestDir}/google/registry/webdriver/goldens/chrome-linux" "${javaTestDir}/google/registry/webdriver/goldens/chrome-linux"
def jsDir = "${project.projectDir}/src/main/javascript"
// Tests that conflict with (mostly unidentified) members of the main test // Tests that conflict with (mostly unidentified) members of the main test
// suite. It is unclear if they are offenders (i.e., those that pollute global // suite. It is unclear if they are offenders (i.e., those that pollute global
@ -480,7 +481,7 @@ task soyToJS {
} }
task stylesheetsToJavascript { task stylesheetsToJavascript {
def cssSourceDir = "${javaDir}/google/registry/ui/css" def cssSourceDir = "${jsDir}/google/registry/ui/css"
def outputDir = "${resourcesDir}/google/registry/ui/css" def outputDir = "${resourcesDir}/google/registry/ui/css"
inputs.dir cssSourceDir inputs.dir cssSourceDir
outputs.dir outputDir outputs.dir outputDir
@ -533,8 +534,8 @@ task compileProdJS(type: JavaExec) {
def outputDir = "${resourcesDir}/google/registry/ui" def outputDir = "${resourcesDir}/google/registry/ui"
def nodeModulesDir = "${rootDir}/node_modules" def nodeModulesDir = "${rootDir}/node_modules"
def cssSourceDir = "${resourcesDir}/google/registry/ui/css" def cssSourceDir = "${resourcesDir}/google/registry/ui/css"
def jsSourceDir = "${javaDir}/google/registry/ui/js" def jsSourceDir = "${jsDir}/google/registry/ui/js"
def externsDir = "${javaDir}/google/registry/ui/externs" def externsDir = "${jsDir}/google/registry/ui/externs"
def soySourceDir = "${generatedDir}/google/registry/ui/soy" def soySourceDir = "${generatedDir}/google/registry/ui/soy"
[nodeModulesDir, cssSourceDir, jsSourceDir, externsDir, soySourceDir].each { [nodeModulesDir, cssSourceDir, jsSourceDir, externsDir, soySourceDir].each {

View file

@ -1,8 +0,0 @@
# -*-protobuf-*-
requirement: {
type: BANNED_PROPERTY_WRITE
error_message: 'Assignment to Element.prototype.innerHTML is not allowed. '
'Use goog.dom.safe.setInnerHtml instead. '
value: 'Element.prototype.innerHTML'
}

View file

@ -28,13 +28,13 @@ module.exports = function(config) {
autoWatch: false, autoWatch: false,
files: [ files: [
'node_modules/google-closure-library/closure/goog/base.js', 'node_modules/google-closure-library/closure/goog/base.js',
'core/build/resources/test/**/*_test.js', 'core/src/test/javascript/**/*_test.js',
{ {
pattern: 'core/build/resources/test/**/!(*_test).js', pattern: 'core/src/test/javascript/**/!(*_test).js',
included: false included: false
}, },
{ {
pattern: 'core/build/resources/main/**/*.js', pattern: 'core/src/main/javascript/**/*.js',
included: false included: false
}, },
{ {
@ -63,9 +63,7 @@ module.exports = function(config) {
'node_modules/google-closure-library/closure/goog/deps.js': ['closure', 'closure-deps'], 'node_modules/google-closure-library/closure/goog/deps.js': ['closure', 'closure-deps'],
'node_modules/google-closure-library/closure/goog/base.js': ['closure'], 'node_modules/google-closure-library/closure/goog/base.js': ['closure'],
'node_modules/google-closure-library/closure/**/*.js': ['closure'], 'node_modules/google-closure-library/closure/**/*.js': ['closure'],
'core/build/resources/test/**/*_test.js': ['closure'], 'core/src/*/javascript/**/*.js': ['closure'],
'core/build/resources/test/**/!(*_test).js': ['closure'],
'core/build/resources/main/**/*.js': ['closure'],
'core/build/generated/source/custom/main/**/*.soy.js': ['closure'], 'core/build/generated/source/custom/main/**/*.soy.js': ['closure'],
'node_modules/soyutils_usegoog.js': ['closure'] 'node_modules/soyutils_usegoog.js': ['closure']
}, },