Skip to content
Permalink
Browse files

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

  • Loading branch information...
gbrodman committed Jul 5, 2019
1 parent 82f51ac commit e5bafddd2fd4577e59143f76ef719866285539a5
Showing with 8 additions and 17 deletions.
  1. +4 −3 core/build.gradle
  2. +0 −8 core/src/main/java/google/registry/ui/conformance_proto.txt
  3. 0 core/src/main/{java → javascript}/google/registry/ui/compile_test.js
  4. 0 core/src/main/{java → javascript}/google/registry/ui/css/admin-settings.css
  5. 0 core/src/main/{java → javascript}/google/registry/ui/css/console.css
  6. 0 core/src/main/{java → javascript}/google/registry/ui/css/contact-settings.css
  7. 0 core/src/main/{java → javascript}/google/registry/ui/css/contact-us.css
  8. 0 core/src/main/{java → javascript}/google/registry/ui/css/dashboard.css
  9. 0 core/src/main/{java → javascript}/google/registry/ui/css/demo_css.css
  10. 0 core/src/main/{java → javascript}/google/registry/ui/css/epp.css
  11. 0 core/src/main/{java → javascript}/google/registry/ui/css/forms.css
  12. 0 core/src/main/{java → javascript}/google/registry/ui/css/kd_components.css
  13. 0 core/src/main/{java → javascript}/google/registry/ui/css/registrar_imports_raw.css
  14. 0 core/src/main/{java → javascript}/google/registry/ui/css/registry.css
  15. 0 core/src/main/{java → javascript}/google/registry/ui/css/resources.css
  16. 0 core/src/main/{java → javascript}/google/registry/ui/css/security-settings.css
  17. 0 core/src/main/{java → javascript}/google/registry/ui/externs/json.js
  18. 0 core/src/main/{java → javascript}/google/registry/ui/js/component.js
  19. 0 core/src/main/{java → javascript}/google/registry/ui/js/console.js
  20. 0 core/src/main/{java → javascript}/google/registry/ui/js/edit_item.js
  21. 0 core/src/main/{java → javascript}/google/registry/ui/js/forms.js
  22. 0 core/src/main/{java → javascript}/google/registry/ui/js/menu_button.js
  23. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/admin_settings.js
  24. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/console.js
  25. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/contact_settings.js
  26. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/contact_us.js
  27. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/dashboard.js
  28. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/main.js
  29. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/resources.js
  30. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/security_settings.js
  31. 0 core/src/main/{java → javascript}/google/registry/ui/js/registrar/whois_settings.js
  32. 0 core/src/main/{java → javascript}/google/registry/ui/js/resource.js
  33. 0 core/src/main/{java → javascript}/google/registry/ui/js/resource_component.js
  34. 0 core/src/main/{java → javascript}/google/registry/ui/js/session.js
  35. 0 core/src/main/{java → javascript}/google/registry/ui/js/util.js
  36. 0 core/src/test/{java → javascript}/google/registry/ui/js/component_test.js
  37. 0 core/src/test/{java → javascript}/google/registry/ui/js/registrar/console_test.js
  38. 0 core/src/test/{java → javascript}/google/registry/ui/js/registrar/console_test_util.js
  39. 0 core/src/test/{java → javascript}/google/registry/ui/js/registrar/contact_settings_test.js
  40. 0 core/src/test/{java → javascript}/google/registry/ui/js/registrar/security_settings_test.js
  41. 0 core/src/test/{java → javascript}/google/registry/ui/js/registrar/whois_settings_test.js
  42. 0 core/src/test/{java → javascript}/google/registry/ui/js/testing.js
  43. +4 −6 karma.conf.js
@@ -25,6 +25,7 @@ def screenshotsForGoldensDir = "${project.buildDir}/screenshots_for_goldens"
def newGoldensDir = "${project.buildDir}/new_golden_images"
def goldensDir =
"${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
// suite. It is unclear if they are offenders (i.e., those that pollute global
@@ -480,7 +481,7 @@ task soyToJS {
}

task stylesheetsToJavascript {
def cssSourceDir = "${javaDir}/google/registry/ui/css"
def cssSourceDir = "${jsDir}/google/registry/ui/css"
def outputDir = "${resourcesDir}/google/registry/ui/css"
inputs.dir cssSourceDir
outputs.dir outputDir
@@ -533,8 +534,8 @@ task compileProdJS(type: JavaExec) {
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 jsSourceDir = "${jsDir}/google/registry/ui/js"
def externsDir = "${jsDir}/google/registry/ui/externs"
def soySourceDir = "${generatedDir}/google/registry/ui/soy"

[nodeModulesDir, cssSourceDir, jsSourceDir, externsDir, soySourceDir].each {

This file was deleted.

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

0 comments on commit e5bafdd

Please sign in to comment.
You can’t perform that action at this time.