Skip to content

Commit

Permalink
Merge pull request #56 from canjs/major
Browse files Browse the repository at this point in the history
Merge major into master for 4.0 release
  • Loading branch information
matthewp authored Jan 29, 2018
2 parents 8c6d59e + bd19da0 commit 069dbaf
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 16 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package-lock=false
14 changes: 6 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "steal-stache",
"version": "3.1.3",
"version": "4.0.0-pre.2",
"description": "Load can-stache templates with StealJS",
"homepage": "http://canjs.com",
"repository": {
Expand All @@ -14,8 +14,7 @@
},
"scripts": {
"preversion": "npm test",
"version": "git commit -am \"Update dist for release\" && git checkout -b release",
"postversion": "git push --tags && git checkout master && git branch -D release && git push",
"postpublish": "git push --tags && git push",
"testee": "testee test/test.html --browsers firefox",
"test": "npm run jshint && npm run testee",
"jshint": "jshint ./*.js --config",
Expand Down Expand Up @@ -46,15 +45,14 @@
}
},
"dependencies": {
"can-stache": "^3.10.0",
"can-stache-bindings": "^3.2.0",
"can-view-import": "^3.1.0",
"jquery": "2.x - 3.x"
"can-stache": "^4.0.0",
"can-stache-bindings": "^4.0.0",
"can-view-import": "^4.0.0"
},
"devDependencies": {
"bit-docs": "0.0.7",
"can-test-helpers": "^1.1.0",
"can-view-nodelist": "^3.1.0",
"can-view-nodelist": "^4.0.0",
"jshint": "^2.9.4",
"steal": "^1.5.11",
"steal-qunit": "^1.0.0",
Expand Down
7 changes: 2 additions & 5 deletions steal-stache.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,8 @@ function template(imports, intermediate, filename){
"\tvar renderer = stache(" + intermediate + ");\n"
) +
"\treturn function(scope, options, nodeList){\n" +
"\t\tvar moduleOptions = { module: module };\n" +
"\t\tif(!(options instanceof mustacheCore.Options)) {\n" +
"\t\t\toptions = new mustacheCore.Options(options || {});\n" +
"\t\t}\n" +
"\t\treturn renderer(scope, options.add(moduleOptions), nodeList);\n" +
"\t\tvar moduleOptions = Object.assign( { module: module }, options );\n" +
"\t\treturn renderer(scope, moduleOptions, nodeList);\n" +
"\t};\n" +
"});";
}
Expand Down
2 changes: 1 addition & 1 deletion test/template.stache
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{{importTestHelper}}
{{importTestHelper()}}
4 changes: 2 additions & 2 deletions test/tests/foo.stache
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<can-import from="test/tests/bar" {^value}="*bar" />
<span>{{*bar}}</span>
<can-import from="test/tests/bar" value:to="scope.vars.bar" />
<span>{{scope.vars.bar}}</span>

0 comments on commit 069dbaf

Please sign in to comment.