Comparing version 2.4.1 to 2.5.0
@@ -45,3 +45,3 @@ 'use strict' | ||
toRelative(path) { | ||
return path.replace(sh.pwd() + '/', '') | ||
return path.replace(sh.pwd().toString() + '/', '') | ||
}, | ||
@@ -48,0 +48,0 @@ |
@@ -120,3 +120,3 @@ #!/usr/bin/env node | ||
}) | ||
}).catch((e) => helpers.err(e)) | ||
@@ -123,0 +123,0 @@ } |
@@ -21,3 +21,3 @@ 'use strict' | ||
// get the content of the tag file analysing it | ||
var results = analyzer(sh.cat(file).replace(/^\uFEFF/g, /* strips BOM */'')) | ||
var results = analyzer(sh.cat(file).toString().replace(/^\uFEFF/g, /* strips BOM */'')) | ||
return { | ||
@@ -24,0 +24,0 @@ file: toRelative(file), |
@@ -104,3 +104,3 @@ 'use strict' | ||
out = compiler.compile( | ||
sh.cat(from).replace(/^\uFEFF/g, /* strips BOM */''), | ||
sh.cat(from).toString().replace(/^\uFEFF/g, /* strips BOM */''), | ||
opt.compiler, | ||
@@ -125,6 +125,4 @@ from | ||
encapsulate(from, opt) { | ||
if (!opt.compiler.modular) return from | ||
var out = `${START_FRAG}${from}${END_FRAG}` | ||
return out | ||
var out = !opt.compiler.modular ? from : `${START_FRAG}${from}${END_FRAG}` | ||
return sh.ShellString(out) | ||
} | ||
@@ -131,0 +129,0 @@ } |
{ | ||
"name": "riot-cli", | ||
"version": "2.4.1", | ||
"version": "2.5.0", | ||
"description": "Riot command line utility", | ||
@@ -28,5 +28,5 @@ "main": "lib/index.js", | ||
"coveralls": "^2.11.9", | ||
"eslint": "^2.5.3", | ||
"eslint": "^2.9.0", | ||
"expect.js": "^0.3.1", | ||
"istanbul": "^0.4.2", | ||
"istanbul": "^0.4.3", | ||
"mocha": "^2.4.5" | ||
@@ -45,6 +45,6 @@ }, | ||
"optionator": "^0.8.1", | ||
"riot-compiler": "^2.3.*", | ||
"rollup": "^0.25.7", | ||
"shelljs": "^0.6.0" | ||
"riot-compiler": "^2.4.*", | ||
"rollup": "^0.26.2", | ||
"shelljs": "^0.7.0" | ||
} | ||
} |
@@ -96,3 +96,3 @@ require('shelljs/global') | ||
}) | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.html`)).to.be(cat(`${EXPECTED_FOLDER}/export/tags.html`)) | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.html`).toString()).to.be(cat(`${EXPECTED_FOLDER}/export/tags.html`).toString()) | ||
@@ -107,3 +107,3 @@ cli.make({ | ||
}) | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.js`)).to.be(cat(`${EXPECTED_FOLDER}/export/tags.js`)) | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.js`).toString()).to.be(cat(`${EXPECTED_FOLDER}/export/tags.js`).toString()) | ||
@@ -119,3 +119,3 @@ cli.make({ | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.css`)).to.be(cat(`${EXPECTED_FOLDER}/export/tags.css`)) | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.css`).toString()).to.be(cat(`${EXPECTED_FOLDER}/export/tags.css`).toString()) | ||
@@ -133,3 +133,3 @@ cli.make({ | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.scss.css`).replace(/\n/g, '')).to.be(cat(`${EXPECTED_FOLDER}/export/tags.scss.css`).replace(/\n/g, '')) | ||
expect(cat(`${GENERATED_FOLDER}/export/make-tags.scss.css`).toString().replace(/\n/g, '')).to.be(cat(`${EXPECTED_FOLDER}/export/tags.scss.css`).toString().replace(/\n/g, '')) | ||
@@ -146,3 +146,3 @@ }) | ||
}) | ||
expect(cat(`${GENERATED_FOLDER}/exclude/css.js`)).to.be(cat(`${EXPECTED_FOLDER}/exclude/css.js`)) | ||
expect(cat(`${GENERATED_FOLDER}/exclude/css.js`).toString()).to.be(cat(`${EXPECTED_FOLDER}/exclude/css.js`).toString()) | ||
@@ -157,3 +157,3 @@ cli.make({ | ||
expect(cat(`${GENERATED_FOLDER}/exclude/css-js.js`)).to.be(cat(`${EXPECTED_FOLDER}/exclude/css-js.js`)) | ||
expect(cat(`${GENERATED_FOLDER}/exclude/css-js.js`).toString()).to.be(cat(`${EXPECTED_FOLDER}/exclude/css-js.js`).toString()) | ||
@@ -160,0 +160,0 @@ }) |
@@ -10,5 +10,5 @@ require('shelljs/global') | ||
logs.forEach((log) => { | ||
expect(cat(`${EXPECTED_LOGS_DIR}/${log}`)).to.be(cat(`${GENERATED_LOGS_DIR}/${log}`)) | ||
expect(cat(`${EXPECTED_LOGS_DIR}/${log}`).toString()).to.be(cat(`${GENERATED_LOGS_DIR}/${log}`).toString()) | ||
}) | ||
}) | ||
}) |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
66053
1122
+ Addedbalanced-match@1.0.2(transitive)
+ Addedbrace-expansion@1.1.11(transitive)
+ Addedconcat-map@0.0.1(transitive)
+ Addedfs.realpath@1.0.0(transitive)
+ Addedglob@7.2.3(transitive)
+ Addedinflight@1.0.6(transitive)
+ Addedinterpret@1.4.0(transitive)
+ Addedis-core-module@2.15.1(transitive)
+ Addedminimatch@3.1.2(transitive)
+ Addedonce@1.4.0(transitive)
+ Addedpath-parse@1.0.7(transitive)
+ Addedrechoir@0.6.2(transitive)
+ Addedresolve@1.22.8(transitive)
+ Addedrollup@0.26.7(transitive)
+ Addedshelljs@0.7.8(transitive)
+ Addedsource-map-support@0.4.18(transitive)
+ Addedsupports-preserve-symlinks-flag@1.0.0(transitive)
+ Addedwrappy@1.0.2(transitive)
- Removedamdefine@1.0.1(transitive)
- Removedrollup@0.25.8(transitive)
- Removedshelljs@0.6.1(transitive)
- Removedsource-map@0.1.32(transitive)
- Removedsource-map-support@0.3.3(transitive)
Updatedriot-compiler@^2.4.*
Updatedrollup@^0.26.2
Updatedshelljs@^0.7.0