From c4721121eb28341acf1b1a784c29cbc171088e07 Mon Sep 17 00:00:00 2001
From: Lai Jiang <jianglai@google.com>
Date: Mon, 4 Nov 2019 15:22:32 -0500
Subject: [PATCH] Move soyutils_usegoog.js out of node_modules (#342)

* Move soyutils_usegoog.js out of node_modules

Everytime the npmInstall runs, it removes this file from node_modules.
Move it outside the folder to prevent this from happening.

* Move karma.conf.js and soyutils_usegooge.js

* Move karma.conf.js to be under core
---
 .gitignore                                                    | 1 -
 config/presubmits.py                                          | 2 +-
 core/build.gradle                                             | 4 ++--
 karma.conf.js => core/karma.conf.js                           | 1 +
 .../src/main/javascript}/soyutils_usegoog.js                  | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename karma.conf.js => core/karma.conf.js (99%)
 rename {node_modules => core/src/main/javascript}/soyutils_usegoog.js (100%)

diff --git a/.gitignore b/.gitignore
index 327b22fe2..17e3b6f81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,7 +98,6 @@ nomulus.iws
 .gradle/
 **/build
 node_modules/**
-!node_modules/soyutils_usegoog.js
 /repos/
 
 # Compiled JS/CSS code
diff --git a/config/presubmits.py b/config/presubmits.py
index 6f77d0172..1efffc953 100644
--- a/config/presubmits.py
+++ b/config/presubmits.py
@@ -80,7 +80,7 @@ PRESUBMITS = {
             ".git", "/build/", "/generated/", "node_modules/",
             "JUnitBackports.java", "registrar_bin.", "registrar_dbg.",
             "google-java-format-diff.py",
-            "nomulus.golden.sql"
+            "nomulus.golden.sql", "soyutils_usegoog.js"
         }, REQUIRED):
         "File did not include the license header.",
 
diff --git a/core/build.gradle b/core/build.gradle
index 2a32ea237..f710bfe74 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -523,7 +523,7 @@ task compileProdJS(type: JavaExec) {
 
   // manually include all the required js files
   closureArgs << "--js=${nodeModulesDir}/google-closure-library/**.js"
-  closureArgs << "--js=${nodeModulesDir}/soyutils_usegoog.js"
+  closureArgs << "--js=${jsDir}/soyutils_usegoog.js"
   closureArgs << "--js=${cssSourceDir}/registrar_bin.css.js"
   closureArgs << "--js=${jsSourceDir}/**.js"
   // TODO(shicong) Verify the compiled JS file works in Alpha
@@ -555,7 +555,7 @@ task karmaTest(type: Exec) {
   dependsOn ':npmInstall'
   workingDir rootProject.projectDir
   executable 'node_modules/karma/bin/karma'
-  args('start')
+  args('start', "${project.projectDir}/karma.conf.js")
 }
 
 test.dependsOn karmaTest
diff --git a/karma.conf.js b/core/karma.conf.js
similarity index 99%
rename from karma.conf.js
rename to core/karma.conf.js
index 84d277f72..91ffb5579 100644
--- a/karma.conf.js
+++ b/core/karma.conf.js
@@ -16,6 +16,7 @@ process.env.CHROME_BIN = require('puppeteer').executablePath()
 
 module.exports = function(config) {
   config.set({
+    basePath: '..',
     browsers: ['ChromeHeadlessNoSandbox'],
     customLaunchers: {
       ChromeHeadlessNoSandbox: {
diff --git a/node_modules/soyutils_usegoog.js b/core/src/main/javascript/soyutils_usegoog.js
similarity index 100%
rename from node_modules/soyutils_usegoog.js
rename to core/src/main/javascript/soyutils_usegoog.js