Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rburns/ansi-to-html
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 770c6e2a03cd8cd4bb32bc5be8087c79e3f31e1c
Choose a base ref
...
head repository: rburns/ansi-to-html
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0c5296c78c768154ceb5e5e3f6c185a100882dbc
Choose a head ref

Commits on Mar 6, 2020

  1. - Optimization: Use strict mode

    - Maintenance: Add `.editorconfig`
    - CI: Add Node 12; drop Node 6 (won't work with eslint 6)
    - npm: Indicate `engines` as a minimum of 8 (since only able to test >= 8 now when using eslint 6)
    - npm: Update devDeps and dep. (`entities`--major bump but public-facing API to be same: https://github.com/fb55/entities/releases )
    brettz9 committed Mar 6, 2020
    Copy the full SHA
    513e2e6 View commit details

Commits on Mar 14, 2020

  1. Bump acorn from 6.1.1 to 6.4.1

    Bumps [acorn](https://github.com/acornjs/acorn) from 6.1.1 to 6.4.1.
    - [Release notes](https://github.com/acornjs/acorn/releases)
    - [Commits](acornjs/acorn@6.1.1...6.4.1)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Mar 14, 2020
    Copy the full SHA
    b5f3723 View commit details

Commits on Apr 12, 2020

  1. Merge pull request #66 from rburns/dependabot/npm_and_yarn/acorn-6.4.1

    Bump acorn from 6.1.1 to 6.4.1
    rburns authored Apr 12, 2020
    Copy the full SHA
    3242301 View commit details
  2. Copy the full SHA
    666741b View commit details
  3. Merge pull request #65 from brettz9/strict-mode

    Strict mode
    rburns authored Apr 12, 2020
    Copy the full SHA
    b5c0c86 View commit details
  4. Copy the full SHA
    6412858 View commit details
  5. Copy the full SHA
    af53232 View commit details
  6. - Lint all files by default, adding an ignore to exclude build or cov…

    …erage files
    
    - Add missing strict directive (caught now by linting)
    brettz9 committed Apr 12, 2020
    Copy the full SHA
    f74054c View commit details

Commits on Apr 13, 2020

  1. Copy the full SHA
    461d6d0 View commit details
  2. Copy the full SHA
    4511f46 View commit details
  3. testing: get full coverage for cli.js; also refactor to use async/a…

    …wait
    
    Also added `istanbul ignore` for unreachable `break` following `process.exit`
    brettz9 committed Apr 13, 2020
    Copy the full SHA
    ec29bb8 View commit details
  4. Copy the full SHA
    412c414 View commit details

Commits on Apr 22, 2020

  1. Merge pull request #67 from brettz9/vulnerabilities

    npm: Updates/fix a few vulnerabilities
    rburns authored Apr 22, 2020
    Copy the full SHA
    d6e70b3 View commit details
  2. Merge pull request #69 from brettz9/linting

    Linting/Strict fix
    rburns authored Apr 22, 2020
    Copy the full SHA
    f14835f View commit details
  3. Merge pull request #71 from brettz9/es6-templates

    refactor: use ES6 Templates for simpler/easier to read code
    rburns authored Apr 22, 2020
    Copy the full SHA
    a0ef3b0 View commit details
  4. Copy the full SHA
    24f74c8 View commit details
  5. Merge pull request #68 from brettz9/coverage

    - Testing: add nyc for checking coverage
    rburns authored Apr 22, 2020
    Copy the full SHA
    6e25fb6 View commit details
  6. Merge pull request #72 from brettz9/cli-coverage

    Cli coverage
    rburns authored Apr 22, 2020
    Copy the full SHA
    3e2d7cd View commit details
  7. Copy the full SHA
    e258d4a View commit details
  8. Merge pull request #73 from brettz9/source-maps

    Source maps
    rburns authored Apr 22, 2020
    Copy the full SHA
    09728d9 View commit details
  9. update package-lock.json

    rburns committed Apr 22, 2020
    Copy the full SHA
    d6d5979 View commit details
  10. update nodejs versions

    rburns committed Apr 22, 2020
    Copy the full SHA
    6438f43 View commit details
  11. Merge pull request #76 from rburns/reintegrte-travis-ci

    update nodejs versions
    rburns authored Apr 22, 2020
    Copy the full SHA
    9da3f6d View commit details

Commits on Apr 24, 2020

  1. ignore .nyc_output directory

    rburns committed Apr 24, 2020
    Copy the full SHA
    deeeee7 View commit details
  2. Copy the full SHA
    98c44aa View commit details
  3. Copy the full SHA
    2b4e8a2 View commit details
  4. Copy the full SHA
    9b9eb35 View commit details
  5. Merge pull request #77 from rburns/type-annotations

    Type annotations
    rburns authored Apr 24, 2020
    Copy the full SHA
    a81c646 View commit details

Commits on Jul 17, 2020

  1. Bump lodash from 4.17.15 to 4.17.19

    Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
    - [Release notes](https://github.com/lodash/lodash/releases)
    - [Commits](lodash/lodash@4.17.15...4.17.19)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Jul 17, 2020
    Copy the full SHA
    2a1f34f View commit details

Commits on Aug 26, 2020

  1. Merge pull request #80 from rburns/dependabot/npm_and_yarn/lodash-4.1…

    …7.19
    
    Bump lodash from 4.17.15 to 4.17.19
    rburns authored Aug 26, 2020
    Copy the full SHA
    598fb59 View commit details

Commits on May 13, 2021

  1. Circleci project setup (#90)

    * Add .circleci/config.yml
    
    * remove travis-ci config
    
    * maybe test on multiple node version
    
    * adjusted attempt
    
    * adjusted attempt
    
    * alternate approach
    
    * Updated config.yml
    
    * adjustments
    
    * replace travisci badge with circleci badge
    rburns authored May 13, 2021
    Copy the full SHA
    228d2a1 View commit details
  2. Bump y18n from 4.0.0 to 4.0.1 (#88)

    Bumps [y18n](https://github.com/yargs/y18n) from 4.0.0 to 4.0.1.
    - [Release notes](https://github.com/yargs/y18n/releases)
    - [Changelog](https://github.com/yargs/y18n/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/yargs/y18n/commits)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Rob Burns <rburns@paiges.net>
    dependabot[bot] and rburns authored May 13, 2021
    Copy the full SHA
    c2d5066 View commit details
  3. Bump lodash from 4.17.19 to 4.17.21 (#89)

    Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
    - [Release notes](https://github.com/lodash/lodash/releases)
    - [Commits](lodash/lodash@4.17.19...4.17.21)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Rob Burns <rburns@paiges.net>
    dependabot[bot] and rburns authored May 13, 2021
    Copy the full SHA
    be095e6 View commit details
  4. bump version number

    rburns committed May 13, 2021
    Copy the full SHA
    b2f2462 View commit details
  5. Copy the full SHA
    e6c3a5b View commit details

Commits on Jun 22, 2021

  1. Add support for xterm256 background color sequences (#92)

    * Currently, only 8bit/256-color foreground color sequences are supported (ESC[ 38;5;⟨n⟩ m)
    * This PR adds additional patterns for 8bit/256-color backgrond color sequences (ESC[ 48;5;⟨n⟩ m) sequences
    remolueoend authored Jun 22, 2021
    Copy the full SHA
    0a5d0f8 View commit details

Commits on Jun 29, 2021

  1. update dependencies

    rburns committed Jun 29, 2021
    Copy the full SHA
    aeee246 View commit details

Commits on Jul 6, 2021

  1. upgrade dependencies

    rburns committed Jul 6, 2021
    Copy the full SHA
    5dd6607 View commit details
  2. Copy the full SHA
    d60ef58 View commit details
  3. adjust version string test

    rburns committed Jul 6, 2021
    Copy the full SHA
    0c5296c View commit details
Showing with 11,266 additions and 2,831 deletions.
  1. +50 −0 .circleci/config.yml
  2. +15 −0 .editorconfig
  3. +2 −0 .eslintignore
  4. +4 −0 .eslintrc.json
  5. +2 −0 .gitignore
  6. +3 −1 .npmignore
  7. +0 −6 .travis.yml
  8. +3 −4 README.md
  9. +1 −0 bin/ansi-to-html
  10. +10,998 −2,770 package-lock.json
  11. +24 −13 package.json
  12. +23 −0 src/ansi_to_html.d.ts
  13. +22 −11 src/ansi_to_html.js
  14. +26 −9 src/cli.js
  15. +9 −1 test/ansi_to_html.js
  16. +82 −16 test/cli.js
  17. +2 −0 test/fixtures/data.txt
50 changes: 50 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
version: 2.1

orbs:
node: circleci/node@4.1

jobs:
build-and-test-16:
docker:
- image: cimg/node:16.1
steps:
- checkout
- node/install-packages
- run:
name: build and test
command: npm run lint && npm run build && npm test
build-and-test-15:
docker:
- image: cimg/node:15.14
steps:
- checkout
- node/install-packages
- run:
name: build and test
command: npm run lint && npm run build && npm test
build-and-test-12:
docker:
- image: cimg/node:14.17
steps:
- checkout
- node/install-packages
- run:
name: build and test
command: npm run lint && npm run build && npm test
build-and-test-14:
docker:
- image: cimg/node:12.22
steps:
- checkout
- node/install-packages
- run:
name: build and test
command: npm run lint && npm run build && npm test

workflows:
test:
jobs:
- build-and-test-16
- build-and-test-15
- build-and-test-14
- build-and-test-12
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.json]
indent_size = 2

[*.yml]
indent_size = 2
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
lib
coverage
4 changes: 4 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -5,8 +5,12 @@
"node": true,
"mocha": true
},
"parserOptions": {
"ecmaVersion": "2018"
},
"extends": "eslint:recommended",
"rules": {
"strict": ["error"],
"indent": ["error", 4, {"SwitchCase": 1}],
"linebreak-style": [
"error",
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.idea
/node_modules/
/lib
coverage
.nyc_output
4 changes: 3 additions & 1 deletion .npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
.eslintrc.json
.travis.yml
.circleci
/node_modules/
/src
coverage
.nyc_output
6 changes: 0 additions & 6 deletions .travis.yml

This file was deleted.

7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
## Ansi to Html

[![](https://img.shields.io/travis/rburns/ansi-to-html.svg)](https://travis-ci.org/rburns/ansi-to-html/branches)
[![rburns](https://circleci.com/gh/rburns/ansi-to-html.svg?style=svg)](https://circleci.com/gh/rburns/ansi-to-html)
[![](https://img.shields.io/npm/v/ansi-to-html.svg)](https://www.npmjs.com/package/ansi-to-html)
![](https://img.shields.io/npm/dm/ansi-to-html.svg)

@@ -100,8 +99,8 @@ npm run lint
npm run build
```

- Builds the `/src` files by running `babel`.
- Saves the built files in `/lib` output directory.
- Builds the `/src` files by running `babel`.
- Saves the built files in `/lib` output directory.
- Recommended to run `babel` in Watch mode - will re-build the project each time the files are changed.
```bash
npm run build:watch
1 change: 1 addition & 0 deletions bin/ansi-to-html
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/usr/bin/env node
'use strict';
require('../lib/cli.js');
Loading