paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-node => -ansii-to-html

Browse Source
This commit is contained in:
Paul Schneider
2021-03-17 19:26:47 +00:00
parent f6daca082c
commit 113fe437cf
6 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Yavsc/Controllers/IT/GitController.cs
View File

@ -45,7 +45,7 @@ namespace Yavsc.Controllers
var accept = Request.Headers["Accept"]; var accept = Request.Headers["Accept"];
if (accept.Any(v => v.Split(',').Contains("text/html"))) if (accept.Any(v => v.Split(',').Contains("text/html")))
{ {
return File(AnsiToHtmlEncoder.GetStream(stream),"text/html"); return File(AnsiToHtmlEncoder.GetStream(stream), "text/html");
} }
return File(stream,"text/text"); return File(stream,"text/text");
} }

1
src/Yavsc/Helpers/Ansi2HtmlEncoder.cs
View File

@ -18,6 +18,7 @@ namespace Yavsc.Helpers
public static Stream GetStream(StreamReader reader) public static Stream GetStream(StreamReader reader)
{ {
// FIXME get some more stable alternative
var procStart = new ProcessStartInfo("node", "node_modules/ansi-to-html/bin/ansi-to-html") var procStart = new ProcessStartInfo("node", "node_modules/ansi-to-html/bin/ansi-to-html")
{ {
UseShellExecute = false, UseShellExecute = false,

1
src/cli/package.json
View File

@ -1,5 +1,4 @@
{ {
"dependencies": { "dependencies": {
"ansi-to-html": "^0.6.11"
} }
} }

7
src/cli/yarn.lock
View File

@ -2,13 +2,6 @@
# yarn lockfile v1 # yarn lockfile v1
ansi-to-html@^0.6.11:
version "0.6.11"
resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.11.tgz#5093fc4962186c0e9343dec572a4f71abdc93439"
integrity sha512-88XZtrcwrfkyn6fGstHnkaF1kl7hGtNCYh4vSmItgEV+6JnQHryDBf7udF4f2RhTRQmYvJvPcTtqgaqrxzc9oA==
dependencies:
entities "^1.1.1"
entities@^1.1.1: entities@^1.1.1:
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"

7
src/test/Makefile
View File

@ -20,10 +20,10 @@ include $(MAKEFILE_DIR)/dnx.mk
$(BINTARGET): project.lock.json ../Yavsc/bin/$(CONFIGURATION)/dnx451/Yavsc.dll ../Yavsc.Abstract/bin/$(CONFIGURATION)/dnx451/Yavsc.Abstract.dll ../Yavsc.Server/bin/$(CONFIGURATION)/dnx451/Yavsc.Server.dll $(BINTARGET): project.lock.json ../Yavsc/bin/$(CONFIGURATION)/dnx451/Yavsc.dll ../Yavsc.Abstract/bin/$(CONFIGURATION)/dnx451/Yavsc.Abstract.dll ../Yavsc.Server/bin/$(CONFIGURATION)/dnx451/Yavsc.Server.dll
dnu build --configuration $(CONFIGURATION) dnu build --configuration $(CONFIGURATION)
non-regression: $(BINTARGET) node_modules/ansi-to-html non-regression: $(BINTARGET)
ASPNET_ENV=Development dnx test -maxthreads 1 -trait regression=non ASPNET_ENV=Development dnx test -maxthreads 1 -trait regression=non
regression: $(BINTARGET) node_modules/ansi-to-html regression: $(BINTARGET)
ASPNET_ENV=Development dnx test -maxthreads 1 -trait regression=oui ASPNET_ENV=Development dnx test -maxthreads 1 -trait regression=oui
test: non-regression test: non-regression
@ -31,9 +31,6 @@ test: non-regression
testdev: $(BINTARGET) testdev: $(BINTARGET)
ASPNET_ENV=Development dnx test -maxthreads 1 -trait dev=wip ASPNET_ENV=Development dnx test -maxthreads 1 -trait dev=wip
node_modules/ansi-to-html:
npm install ansi-to-html
clean: clean:
rm -rf bin obj testingrepo rm -rf bin obj testingrepo

2
src/test/NonRegression/NodeTests.cs
View File

@ -13,7 +13,6 @@ namespace test
[Trait("regression", "oui")] [Trait("regression", "oui")]
public class NodeTests public class NodeTests
{ {
[Fact]
void TestNodeJsForAnsitohtml () void TestNodeJsForAnsitohtml ()
{ {
var procStart = new ProcessStartInfo("node", "node_modules/ansi-to-html/bin/ansi-to-html") var procStart = new ProcessStartInfo("node", "node_modules/ansi-to-html/bin/ansi-to-html")
@ -32,7 +31,6 @@ namespace test
} }
} }
[Fact]
void AnsiToHtml() void AnsiToHtml()
{ {
var procStart = new ProcessStartInfo("ls", "-l --color=always") var procStart = new ProcessStartInfo("ls", "-l --color=always")