Skip to content

Commit

Permalink
Merge pull request #66 from Medium/valueof/update
Browse files Browse the repository at this point in the history
Updated soynode with new closure-templates and closure-library deps
  • Loading branch information
valueof committed Jan 20, 2017
2 parents 3378e99 + 84d5df1 commit 6afbd81
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
7 changes: 3 additions & 4 deletions lib/SoyCompiler.js
Expand Up @@ -229,7 +229,6 @@ SoyCompiler.prototype._compileTemplateFilesAsync = function (inputDir, outputDir
var args = [
'-classpath', [ PATH_TO_SOY_JAR ].concat(options.classpath).join(path.delimiter),
'com.google.template.soy.SoyToJsSrcCompiler',
'--codeStyle', 'concat',
'--shouldGenerateJsdoc'
]

Expand Down Expand Up @@ -268,9 +267,9 @@ SoyCompiler.prototype._compileTemplateFilesAsync = function (inputDir, outputDir
args.push('--shouldDeclareTopLevelNamespaces', 'false')
}

// Always turn on isUsingIjData.
// https://groups.google.com/forum/#!topic/closure-templates-discuss/8rxD9I0QrtI
args.push('--isUsingIjData')
if (options.protoFileDescriptors) {
args.push('--protoFileDescriptors', options.protoFileDescriptors)
}

args.push('--outputPathFormat', outputPathFormat)

Expand Down
6 changes: 3 additions & 3 deletions lib/SoyOptions.js
Expand Up @@ -159,10 +159,10 @@ function SoyOptions() {
this.shouldDeclareTopLevelNamespaces = true

/**
* Indicates that $ij variables are used and should be passed between templates.
* @type {boolean}
* Points to a directory with proto files
* @type {string}
*/
this.isUsingIjData = false
this.protoFileDescriptors = ''
}


Expand Down
6 changes: 3 additions & 3 deletions package.json
@@ -1,6 +1,6 @@
{
"name" : "soynode",
"version" : "2.0.1",
"version" : "2.1.0",
"description" : "Utility for working with Closure Templates, aka Soy, from within a node.js application.",
"keywords" : ["node", "soy", "templates", "closure"],
"repository" : {
Expand All @@ -16,9 +16,9 @@
"main" : "./lib/soynode.js",
"directories": {"lib": "./lib"},
"dependencies": {
"closure-templates": "^20151008.0.0",
"closure-templates": "^20160825.0.0",
"fs-extra": "1.0.0",
"obvious-closure-library": "^20151008.0.0",
"obvious-closure-library": "^20161024.0.0",
"q": "1.4.1"
},
"devDependencies": {
Expand Down

0 comments on commit 6afbd81

Please sign in to comment.