archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

jsonminify to strip-json-comments

Browse Source
This commit is contained in:
Austin Rausch 2016-05-03 21:10:18 -04:00
parent 951c0dc906
commit f75043178f
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/taglib-loader/scanTagsDir.js
View File

@ -17,7 +17,7 @@
var nodePath = require('path');
var fs = require('fs');
var jsonminify = require('jsonminify');
var stripJsonComments = require('strip-json-comments');
var tagDefFromCode = require('./tag-def-from-code');
var loader = require('./loader');
var fsReadOptions = { encoding: 'utf8' };
@ -109,7 +109,7 @@ module.exports = function scanTagsDir(tagsConfigPath, tagsConfigDirname, dir, ta
hasTagFile = true;
// marko-tag.json exists in the directory, use that as the tag definition
try {
tagDef = JSON.parse(jsonminify(fs.readFileSync(tagFile, fsReadOptions)));
tagDef = JSON.parse(stripJsonComments(fs.readFileSync(tagFile, fsReadOptions)));
} catch(e) {
throw new Error('Unable to parse JSON file at path "' + tagFile + '". Error: ' + e);
}

6
compiler/taglib-loader/taglib-reader.js
View File

@ -15,16 +15,16 @@
*/
var fs = require('fs');
var jsonminify = require('jsonminify');
var stripJsonComments = require('strip-json-comments');
var fsReadOptions = { encoding: 'utf8' };
exports.readTaglib = function (path) {
var json = fs.readFileSync(path, fsReadOptions);
try {
var taglibProps = JSON.parse(jsonminify(json));
var taglibProps = JSON.parse(stripJsonComments(json));
return taglibProps;
} catch(e) {
throw new Error('Unable to parse taglib at path "' + path + '". Error: ' + e);
}
};
};

2
package.json
View File

@ -31,7 +31,6 @@
"esprima": "^2.7.0",
"events": "^1.0.2",
"htmljs-parser": "^1.5.3",
"jsonminify": "^0.2.3",
"lasso-package-root": "^1.0.0",
"minimatch": "^0.2.14",
"property-handlers": "^1.0.0",
@ -45,6 +44,7 @@
"raptor-strings": "^1.0.0",
"raptor-util": "^1.0.0",
"resolve-from": "^1.0.0",
"strip-json-comments": "^2.0.1",
"try-require": "^1.2.1"
},
"devDependencies": {