From a81ae1836268df748dd3b4047c3b6fb9912dea55 Mon Sep 17 00:00:00 2001 From: Gregg Roemhildt Date: Tue, 20 Jun 2017 18:34:40 -0500 Subject: [PATCH 1/3] remove json.stringify which causes errors --- index.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/index.js b/index.js index 47254a5..5a8792a 100644 --- a/index.js +++ b/index.js @@ -30,9 +30,7 @@ module.exports = function (scope, options, nodeList) { } module.exports = function canStacheLoader(source) { - const src = JSON.stringify(source); - const intermediateAndImports = getIntermediateAndImports(source); - return getTemplate(src, intermediateAndImports.imports); + return getTemplate(source, intermediateAndImports.imports); }; From 984f092e98c25d9f2c6000a9e5c49254a5de78bd Mon Sep 17 00:00:00 2001 From: Gregg Roemhildt Date: Tue, 20 Jun 2017 18:49:08 -0500 Subject: [PATCH 2/3] use canjs 3 libs --- index.js | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/index.js b/index.js index 5a8792a..fe82f91 100644 --- a/index.js +++ b/index.js @@ -1,14 +1,12 @@ -const getIntermediateAndImports = require('./intermediate_and_imports'); -// const getIntermediateAndImports = require('can-stache/src/intermediate_and_imports'); -// const getIntermediateAndImports = require('can/dist/cjs/view/stache/intermediate_and_imports'); +const getIntermediateAndImports = require("can-stache/src/intermediate_and_imports"); const getTemplate = (source, imports) => { const requires = imports.map(i => `require('${i}');`).join('\n'); - return `var stache = require('can/dist/cjs/view/stache/stache'); -var mustacheCore = require('can/dist/cjs/view/stache/mustache_core'); -var getIntermediateAndImports = require('can/dist/cjs/view/stache/intermediate_and_imports'); + return `var stache = require('can-stache'); +var mustacheCore = require('can-stache/src/mustache_core'); +var getIntermediateAndImports = require("can-stache/src/intermediate_and_imports"); ${requires} @@ -20,17 +18,18 @@ var renderer = stache(intermediate); module.exports = function (scope, options, nodeList) { var moduleOptions = { module: module }; - + if (!(options instanceof mustacheCore.Options)) { options = new mustacheCore.Options(options || {}); } - + return renderer(scope, options.add(moduleOptions), nodeList); };`; } module.exports = function canStacheLoader(source) { - const intermediateAndImports = getIntermediateAndImports(source); - return getTemplate(source, intermediateAndImports.imports); + const intermediateAndImports = getIntermediateAndImports(source); + + return getTemplate(source, intermediateAndImports.imports); }; From 7cd4b80f6e59e42f6e14db20276e4db78d3410b4 Mon Sep 17 00:00:00 2001 From: Gregg Roemhildt Date: Tue, 20 Jun 2017 18:50:07 -0500 Subject: [PATCH 3/3] Remove canjs 2.x dependency --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 34f9463..08eea69 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,6 @@ "mustache" ], "dependencies": { - "can": "^2.3.31", "can-stache": "^3.0.25", "can-view-parser": "^3.3.0" },