Skip to content
Permalink
Browse files

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
  • Loading branch information
jianglai committed Nov 4, 2019
1 parent 37b9999 commit c4721121eb28341acf1b1a784c29cbc171088e07
@@ -98,7 +98,6 @@ nomulus.iws
.gradle/
**/build
node_modules/**
!node_modules/soyutils_usegoog.js
/repos/

# Compiled JS/CSS code
@@ -80,7 +80,7 @@ def fails(self, file):
".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.",

@@ -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
@@ -16,6 +16,7 @@ process.env.CHROME_BIN = require('puppeteer').executablePath()

module.exports = function(config) {
config.set({
basePath: '..',
browsers: ['ChromeHeadlessNoSandbox'],
customLaunchers: {
ChromeHeadlessNoSandbox: {
File renamed without changes.

0 comments on commit c472112

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