initial impl with wontache

.circleci/config.yml

@@ -0,0 +1,219 @@
+version: 2.1
+
+jobs:
+  checkout-and-version:
+    docker:
+      - image: codacy/git-version
+    working_directory: ~/workdir
+    steps:
+      - checkout
+      - run:
+          name: Get next version
+          command: |
+            export NEXT_VERSION="$(/bin/git-version --folder=$PWD --release-branch=master)"
+            echo "Next version is ${NEXT_VERSION}"
+            echo "${NEXT_VERSION}" > .version
+      - run:
+          name: Get next npm tag name
+          command: |
+            if [ "${CIRCLE_BRANCH}" = "master" ]; then
+              export PUBLISH_TAG="latest"
+            elif [ "${CIRCLE_BRANCH}" = "next" ]; then
+              export PUBLISH_TAG="next"
+            else
+              export PUBLISH_TAG="pr"
+            fi
+            echo "Next tag is ${PUBLISH_TAG}"
+            echo "${PUBLISH_TAG}" > .tag
+      - persist_to_workspace:
+          root: ~/workdir
+          paths:
+            - '*'
+
+  build-common: &build-common
+    docker:
+      - image: node
+    working_directory: ~/workdir
+    steps:
+      - attach_workspace:
+          at: ~/workdir
+      - restore_cache:
+          key: yarn-cache-{{ checksum "yarn.lock" }}
+      - run:
+          name: Log environment setup
+          command: |
+            node -v
+            yarn -v
+      - run:
+          name: Install dependencies
+          command: yarn install --ignore-engines
+      - save_cache:
+          key: yarn-cache-{{ checksum "yarn.lock" }}
+          paths:
+            - /usr/local/share/.cache/yarn
+      - run:
+          name: Build templates
+          command: yarn run build:templates
+      - run:
+          name: Build library
+          command: yarn run build
+
+  build-stable: &build-stable
+    docker:
+      - image: node
+    working_directory: ~/workdir
+    steps:
+      - attach_workspace:
+          at: ~/workdir
+      - restore_cache:
+          key: yarn-cache-{{ checksum "yarn.lock" }}
+      - run:
+          name: Log environment setup
+          command: |
+            node -v
+            yarn -v
+      - run:
+          name: Install dependencies
+          command: yarn
+      - save_cache:
+          key: yarn-cache-{{ checksum "yarn.lock" }}
+          paths:
+            - /usr/local/share/.cache/yarn
+      - run:
+          name: Validate & Build
+          command: yarn run validate
+      - store_artifacts:
+          path: coverage
+      - store_test_results:
+          path: coverage
+      - run: yarn run coverage:push
+      - persist_to_workspace:
+          root: ~/workdir
+          paths:
+            - '*'
+
+  build-node-18:
+    <<: *build-stable
+    docker:
+      - image: node:18
+
+  build-node-16:
+    <<: *build-common
+    docker:
+      - image: node:16
+
+  tag_version:
+    docker:
+      - image: node:18
+    working_directory: ~/workdir
+    steps:
+      - attach_workspace:
+          at: ~/workdir
+      - run:
+          name: Configure Git
+          command: |
+            git config user.email "circleci@users.noreply.github.com"
+            git config user.name "CircleCI"
+      - run:
+          name: Tag version
+          command: |
+            git tag "$(cat .version)"
+            git push --tags "https://rtfpessoa:$GPR_AUTH_TOKEN@github.com/rtfpessoa/diff2html"
+
+  publish_library:
+    docker:
+      - image: node:18
+    working_directory: ~/workdir
+    steps:
+      - attach_workspace:
+          at: ~/workdir
+      - run:
+          name: Configure Yarn version
+          command: |
+            yarn config set version-tag-prefix ""
+            yarn config set version-git-message "Release version %s"
+      - run:
+          name: Configure Git
+          command: |
+            git config user.email "circleci@users.noreply.github.com"
+            git config user.name "CircleCI"
+      - run:
+          name: Version package
+          command: |
+            # Update version in packages to publish
+            yarn version --non-interactive --new-version $(cat .version)
+      - run:
+          name: Setup npm credentials
+          command: |
+            rm -f .npmrc
+            touch .npmrc
+            echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
+            echo "registry=https://registry.npmjs.org/" >> .npmrc
+            echo "access=public" >> .npmrc
+            echo "save-exact=true" >> .npmrc
+      - run:
+          name: Publish npm package
+          command: |
+            # Publish package versions to npmjs.org
+            yarn publish --tag $(cat .tag) --non-interactive --new-version $(cat .version)
+      - run:
+          name: Setup gpr credentials
+          command: |
+            rm -f .npmrc
+            touch .npmrc
+            echo "//npm.pkg.github.com/:_authToken=${GPR_AUTH_TOKEN}" >> .npmrc
+            echo "@rtfpessoa:registry=https://npm.pkg.github.com/" >> .npmrc
+            echo "access=public" >> .npmrc
+            echo "save-exact=true" >> .npmrc
+      - run:
+          name: Publish gpr package
+          command: |
+            # HACK: Override npm package name to be able to publish in GitHub
+            sed -i 's/^  "name":.*/  "name": "@rtfpessoa\/diff2html",/g' package.json
+            echo "Going to publish version $(cat .version) to GitHub"
+            yarn publish --tag $(cat .tag) --non-interactive --new-version $(cat .version)
+            # HACK: Restore npm package name
+            sed -i 's/^  "name":.*/  "name": "diff2html",/g' package.json
+
+  publish_website:
+    machine:
+      image: ubuntu-1604:202004-01
+    working_directory: ~/workdir
+    steps:
+      - attach_workspace:
+          at: ~/workdir
+      - run:
+          name: Deploy
+          working_directory: ~/workdir/docs
+          command: |
+            aws s3 sync --region eu-west-1 --delete . s3://diff2html.xyz --metadata-directive REPLACE --cache-control max-age=31557600
+            aws cloudfront create-invalidation --region eu-west-1 --distribution-id $AWS_CF_DISTRIBUTION_ID --paths /index.html /demo.html /sitemap.xml /robots.txt
+
+workflows:
+  validate-and-publish:
+    jobs:
+      - checkout-and-version
+      - build-node-16:
+          requires:
+            - checkout-and-version
+      - build-node-18:
+          requires:
+            - checkout-and-version
+      - publish_approval:
+          type: approval
+          requires:
+            - build-node-16
+            - build-node-18
+      - tag_version:
+          requires:
+            - publish_approval
+      - publish_library:
+          requires:
+            - tag_version
+      - publish_website:
+          requires:
+            - tag_version
+          filters:
+            branches:
+              only:
+                - master

.eslintrc.js

@@ -0,0 +1,58 @@
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 2018,
+    sourceType: 'module',
+  },
+  env: {
+    browser: true,
+    es6: true,
+    node: true,
+  },
+  globals: {
+    Atomics: 'readonly',
+    SharedArrayBuffer: 'readonly',
+    document: 'readonly',
+    navigator: 'readonly',
+    window: 'readonly',
+  },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:json/recommended',
+    'plugin:promise/recommended',
+    'plugin:import/errors',
+    'plugin:import/warnings',
+    'plugin:import/typescript',
+    'plugin:node/recommended',
+    'plugin:sonarjs/recommended',
+    'plugin:jest/recommended',
+    'plugin:jest/style',
+    'prettier',
+  ],
+  plugins: ['@typescript-eslint', 'json', 'promise', 'import', 'node', 'sonarjs', 'jest', 'optimize-regex'],
+  rules: {
+    // Enable
+    'optimize-regex/optimize-regex': 'error',
+    // Hack: For some reason we need pass again the extensions
+    'node/no-missing-import': [
+      'error',
+      {
+        tryExtensions: ['.js', '.jsx', '.ts', '.tsx', '.json'],
+      },
+    ],
+    // Disable
+    // https://github.com/benmosher/eslint-plugin-import/issues/1446
+    'import/named': 'off',
+    // We don't need this since we are using transpilation
+    'node/no-unsupported-features/es-syntax': 'off',
+    'no-process-exit': 'off',
+    // Too verbose
+    'sonarjs/no-duplicate-string': 'off',
+    // Too verbose
+    'sonarjs/cognitive-complexity': 'off',
+    // Too verbose
+    'sonarjs/no-nested-template-literals': 'off',
+  },
+};

.github/workflows/ci.yml

@@ -1,12 +0,0 @@
-name: ci
-
-on:
-  pull_request:
-    branches: [master]
-
-jobs:
-  test-and-publish:
-    uses: ./.github/workflows/test-and-publish.yml
-    with:
-      environment: dev
-    secrets: inherit

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,51 @@
+name: "Code scanning - action"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 19 * * 1'
+
+jobs:
+  CodeQL-Build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+      
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      # Override language selection by uncommenting this and choosing your languages
+      # with:
+      #   languages: go, javascript, csharp, python, cpp, java
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/release.yml

@@ -1,35 +0,0 @@
-name: release
-
-on:
-  push:
-    branches: [master]
-
-jobs:
-  test-and-publish:
-    uses: ./.github/workflows/test-and-publish.yml
-    with:
-      environment: production
-    secrets: inherit
-
-  publish-website:
-    runs-on: ubuntu-latest
-    container:
-      image: amazon/aws-cli
-    needs: [test-and-publish]
-    environment: 'production'
-    steps:
-      - name: Download docs
-        uses: actions/download-artifact@v4
-        with:
-          name: docs
-          path: docs/
-      - name: Publish to S3
-        working-directory: docs
-        env:
-          AWS_CF_DISTRIBUTION_ID: ${{ secrets.AWS_CF_DISTRIBUTION_ID }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
-        run: |
-          aws s3 sync --region eu-west-1 --delete . s3://diff2html.xyz --metadata-directive REPLACE --cache-control max-age=31557600
-          aws cloudfront create-invalidation --region eu-west-1 --distribution-id $AWS_CF_DISTRIBUTION_ID --paths /index.html /demo.html /sitemap.xml /robots.txt

.github/workflows/test-and-publish.yml

@@ -1,148 +0,0 @@
-name: test-and-publish
-
-on:
-  workflow_call:
-    inputs:
-      environment:
-        required: true
-        type: string
-
-jobs:
-  version:
-    runs-on: ubuntu-latest
-    container:
-      image: codacy/git-version
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Fix tar access
-        run: apk add --update --no-progress tar
-      - name: Fix git access
-        run: |
-          git config --global --add safe.directory /__w/diff2html/diff2html
-      - name: Get next version
-        run: |
-          export NEXT_VERSION="$(/bin/git-version --folder=$PWD --release-branch=master)"
-          echo "Next version is ${NEXT_VERSION}"
-          echo "${NEXT_VERSION}" > next-version.txt
-          echo "version=${NEXT_VERSION}" >> $GITHUB_ENV
-      - name: Get next npm tag name
-        run: |
-          if [ "${GITHUB_REF_NAME}" = "master" ]; then
-            export PUBLISH_TAG="latest"
-          elif [ "${GITHUB_REF_NAME}" = "next" ]; then
-            export PUBLISH_TAG="next"
-          else
-            export PUBLISH_TAG="pr"
-          fi
-          echo "Next tag is ${PUBLISH_TAG}"
-          echo "${PUBLISH_TAG}" > publish-tag.txt
-      - name: Upload versions
-        uses: actions/upload-artifact@v4
-        with:
-          name: versions
-          if-no-files-found: error
-          path: |
-            next-version.txt
-            publish-tag.txt
-
-  build:
-    runs-on: ubuntu-latest
-    needs: [version]
-    strategy:
-      matrix:
-        node-version: [16.x, 18.x, 20.x, 22.x]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'npm'
-      - name: Log environment setup
-        run: |
-          node -v
-          npm -v
-      - name: Install dependencies
-        run: npm install
-      - name: Build templates
-        run: npm run build:templates
-      - name: Build library
-        run: npm run build
-
-  publish:
-    runs-on: ubuntu-latest
-    needs: [build]
-    environment: ${{ inputs.environment }}
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Download versions
-        uses: actions/download-artifact@v4
-        with:
-          name: versions
-      - name: Store version
-        run: echo "version=$(cat next-version.txt)" >> $GITHUB_ENV
-      - name: Configure Git
-        run: |
-          git config user.email "gh-actions@users.noreply.github.com"
-          git config user.name "GitHub Actions"
-      - name: Tag commit
-        uses: tvdias/github-tagger@v0.0.1
-        with:
-          repo-token: '${{ secrets.GITHUB_TOKEN }}'
-          tag: '${{ env.version }}'
-      - name: Install dependencies
-        run: npm install
-      - uses: actions/setup-node@v3
-        with:
-          registry-url: 'https://registry.npmjs.org'
-          node-version: '22.x'
-      - name: Configure NPM version
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: |
-          rm -f .npmrc
-          touch .npmrc
-          echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
-          echo "registry=https://registry.npmjs.org/" >> .npmrc
-          echo "access=public" >> .npmrc
-          echo "save-exact=true" >> .npmrc
-      - name: Version package
-        run: |
-          # Update version in packages to publish
-          npm version $(cat next-version.txt) -m "Release version %s"
-      - name: Publish to NPM
-        run: npm publish --tag $(cat publish-tag.txt)
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '22.x'
-          registry-url: 'https://npm.pkg.github.com'
-      - name: Configure NPM version
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          rm -f .npmrc
-          touch .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
-          echo "@rtfpessoa:registry=https://npm.pkg.github.com/" >> .npmrc
-          echo "access=public" >> .npmrc
-          echo "save-exact=true" >> .npmrc
-      - name: Publish to GPR
-        run: |
-          # HACK: Override npm package name to be able to publish in GitHub
-          sed -i 's/^  "name":.*/  "name": "@rtfpessoa\/diff2html",/g' package.json
-          echo "Going to publish version $(cat next-version.txt) to GitHub"
-          npm publish --tag $(cat publish-tag.txt)
-          # HACK: Restore npm package name
-          sed -i 's/^  "name":.*/  "name": "diff2html",/g' package.json
-      - name: Upload docs
-        uses: actions/upload-artifact@v4
-        with:
-          name: docs
-          if-no-files-found: error
-          path: docs/

.gitignore

@@ -29,18 +29,9 @@ bower_components/
 # Terraform
 /terraform/.terraform
 
-# Compiled templates
+/_target/
 /src/diff2html-templates.*
-
-# Compiled website
 /docs/
-
-# Bundles temporary typescript files compiled by webpack
-/bundles-out/
-
-# Web bundles
 /bundles/
-# CommonJS library
 /lib/
-# ESNext library
 /lib-esm/

.husky/pre-commit

@@ -1,3 +1,4 @@
 #!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
 
-npm run lint:staged
+npx lint-staged

CONTRIBUTING.md

@@ -10,9 +10,9 @@
 
 - Before sending a pull request make sure your code is tested.
 
-- Before sending a pull request for a feature, be sure to run tests with `npm run test`.
+- Before sending a pull request for a feature, be sure to run tests with `yarn test`.
 
-- Use the same coding style as the rest of the codebase, most of the check can be performed with `npm run run lint`.
+- Use the same coding style as the rest of the codebase, most of the check can be performed with `yarn run lint`.
 
 - Use `git rebase` (not `git merge`) to sync your work from time to time with the master branch.
 

README.md

@@ -1,20 +1,23 @@
 # diff2html
 
-[![npm](https://img.shields.io/npm/v/diff2html)](https://www.npmjs.com/package/diff2html)
-[![node](https://img.shields.io/node/v/diff2html)](https://www.npmjs.com/package/diff2html)
-[![npm](https://img.shields.io/npm/l/diff2html)](https://www.npmjs.com/package/diff2html)
-[![GitHub Actions](https://github.com/rtfpessoa/diff2html/actions/workflows/release.yml/badge.svg)](https://github.com/rtfpessoa/diff2html/actions/workflows/release.yml)
-
-[![npm weekly downloads](https://img.shields.io/npm/dw/diff2html)](https://www.npmjs.com/package/diff2html)
-[![npm monthly downloads](https://img.shields.io/npm/dm/diff2html)](https://www.npmjs.com/package/diff2html)
-[![npm yearly downloads](https://img.shields.io/npm/dy/diff2html)](https://www.npmjs.com/package/diff2html)
-[![npm downloads](https://img.shields.io/npm/dt/diff2html)](https://www.npmjs.com/package/diff2html)
+[![Codacy Quality Badge](https://api.codacy.com/project/badge/Grade/06412dc3f5a14f568778d0db8a1f7dc8)](https://www.codacy.com/app/rtfpessoa/diff2html?utm_source=github.com&utm_medium=referral&utm_content=rtfpessoa/diff2html&utm_campaign=Badge_Grade)
+[![Codacy Coverage Badge](https://api.codacy.com/project/badge/Coverage/06412dc3f5a14f568778d0db8a1f7dc8)](https://www.codacy.com/app/rtfpessoa/diff2html?utm_source=github.com&utm_medium=referral&utm_content=rtfpessoa/diff2html&utm_campaign=Badge_Coverage)
+[![CircleCI](https://circleci.com/gh/rtfpessoa/diff2html.svg?style=svg)](https://circleci.com/gh/rtfpessoa/diff2html)
 
+[![npm](https://img.shields.io/npm/v/diff2html?style=flat)](https://www.npmjs.com/package/diff2html)
+[![Dependency Status](https://david-dm.org/rtfpessoa/diff2html.svg)](https://david-dm.org/rtfpessoa/diff2html)
+[![devDependency Status](https://david-dm.org/rtfpessoa/diff2html/dev-status.svg)](https://david-dm.org/rtfpessoa/diff2html#info=devDependencies)
 [![jsdelivr CDN Downloads](https://data.jsdelivr.com/v1/package/npm/diff2html/badge)](https://www.jsdelivr.com/package/npm/diff2html)
-[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange)](#contributors)
+
+[![node](https://img.shields.io/node/v/diff2html.svg)]() [![npm](https://img.shields.io/npm/l/diff2html.svg)]()
+[![npm](https://img.shields.io/npm/dm/diff2html.svg)](https://www.npmjs.com/package/diff2html)
+[![All Contributors](https://img.shields.io/badge/all_contributors-22-orange.svg?style=flat-square)](#contributors)
+[![Gitter](https://badges.gitter.im/rtfpessoa/diff2html.svg)](https://gitter.im/rtfpessoa/diff2html?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 diff2html generates pretty HTML diffs from git diff or unified diff output.
 
+[![NPM](https://nodei.co/npm/diff2html.png?downloads=true&downloadRank=true&stars=true)](https://nodei.co/npm/diff2html/)
+
 ## Table of Contents
 
 <!-- toc -->
@@ -153,7 +156,6 @@ draw(): void
 synchronisedScroll(): void
 fileListToggle(startVisible: boolean): void
 highlightCode(): void
-stickyFileHeaders(): void
 ```
 
 ### Diff2HtmlUI Configuration
@@ -163,7 +165,6 @@ stickyFileHeaders(): void
 - `fileListToggle`: allow the file summary list to be toggled: `true` or `false`, default is `true`
 - `fileListStartVisible`: choose if the file summary list starts visible: `true` or `false`, default is `false`
 - `fileContentToggle`: allow each file contents to be toggled: `true` or `false`, default is `true`
-- `stickyFileHeaders`: make file headers sticky: `true` or `false`, default is `true`
 - [All the options](#diff2html-configuration) from Diff2Html are also valid configurations in Diff2HtmlUI
 
 ### Diff2HtmlUI Browser
@@ -201,7 +202,7 @@ diff2htmlUi.draw();
 
 ```html
 <!-- Stylesheet -->
-<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/styles/github.min.css" />
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.13.1/styles/github.min.css" />
 <link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/diff2html/bundles/css/diff2html.min.css" />
 
 <!-- Javascripts -->
@@ -227,21 +228,6 @@ document.addEventListener('DOMContentLoaded', () => {
 });
 ```
 
-When using the `auto` color scheme, you will need to specify both the light and dark themes for highlight.js to use.
-
-```html
-<link
-  rel="stylesheet"
-  href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/styles/github.min.css"
-  media="screen and (prefers-color-scheme: light)"
-/>
-<link
-  rel="stylesheet"
-  href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.8.0/styles/github-dark.min.css"
-  media="screen and (prefers-color-scheme: dark)"
-/>
-```
-
 #### Collapsable File Summary List
 
 > Add the dependencies.
@@ -268,7 +254,7 @@ document.addEventListener('DOMContentLoaded', () => {
 #### Example with plain HTML+CSS+JS
 
 ```html
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en-us">
   <head>
     <meta charset="utf-8" />
@@ -321,7 +307,7 @@ import { Controller } from '@hotwired/stimulus';
 
 import { Diff2HtmlUI, Diff2HtmlUIConfig } from 'diff2html/lib/ui/js/diff2html-ui-slim.js';
 
-// Requires `npm install highlight.js`
+// Requires `yarn add highlight.js`
 import 'highlight.js/styles/github.css';
 import 'diff2html/bundles/css/diff2html.min.css';
 
@@ -390,7 +376,7 @@ The HTML output accepts a Javascript object with configuration. Possible options
   `false`
 - `matchingMaxComparisons`: perform at most this much comparisons for line matching a block of changes, default is
   `2500`
-- `maxLineSizeInBlockForComparison`: maximum number of characters of the bigger line in a block to apply comparison,
+- `maxLineSizeInBlockForComparison`: maximum number os characters of the bigger line in a block to apply comparison,
   default is `200`
 - `compiledTemplates`: object ([Hogan.js](https://github.com/twitter/hogan.js/) template values) with previously
   compiled templates to replace parts of the html, default is `{}`. For example:
@@ -399,10 +385,6 @@ The HTML output accepts a Javascript object with configuration. Possible options
   For example: `{ "tag-file-changed": "<span class="d2h-tag d2h-changed d2h-changed-tag">MODIFIED</span>" }`
   > For more information regarding the possible templates look into
   > [src/templates](https://github.com/rtfpessoa/diff2html/tree/master/src/templates)
-- `highlightLanguages`: Map of extension to language name, used for highlighting. This overrides the default language
-  detection based on file extensions.
-- `colorScheme`: color scheme to use for the diff, default is `light`. Possible values are `light`, `dark`, and `auto`
-  which will use the browser's preferred color scheme.
 
 ### Diff2Html Browser
 
@@ -470,7 +452,7 @@ export class AppDiffComponent implements OnInit {
 - HTML
 
 ```html
-<!doctype html>
+<!DOCTYPE html>
 <html>
   <head>
     <title>diff2html</title>

eslint.config.mjs

@@ -1,77 +0,0 @@
-import globals from 'globals';
-import eslint from '@eslint/js';
-import tseslint from 'typescript-eslint';
-import pluginJest from 'eslint-plugin-jest';
-import json from '@eslint/json';
-import pluginPromise from 'eslint-plugin-promise';
-
-export default [
-  { ...eslint.configs.recommended, files: ['src/**/*.{js,mjs,cjs,ts}'] },
-  ...tseslint.configs.recommended,
-  // ...tseslint.configs.recommendedTypeChecked,
-  // ...tseslint.configs.strict,
-  // ...tseslint.configs.stylistic,
-  // ...tseslint.configs.strictTypeChecked,
-  // ...tseslint.configs.stylisticTypeChecked,
-  {
-    rules: {
-      '@typescript-eslint/no-unused-vars': [
-        'error',
-        {
-          args: 'all',
-          argsIgnorePattern: '^_',
-          caughtErrors: 'all',
-          caughtErrorsIgnorePattern: '^_',
-          destructuredArrayIgnorePattern: '^_',
-          varsIgnorePattern: '^_',
-          ignoreRestSiblings: true,
-        },
-      ],
-    },
-  },
-  pluginPromise.configs['flat/recommended'],
-  {
-    plugins: {
-      json,
-    },
-    files: ['**/*.json'],
-    language: 'json/json',
-    rules: {
-      'json/no-duplicate-keys': 'error',
-    },
-  },
-  {
-    ...pluginJest.configs['flat/recommended'],
-    ...pluginJest.configs['flat/style'],
-    files: ['src/__tests__/**/*tests.ts'],
-    plugins: { jest: pluginJest },
-    languageOptions: {
-      globals: pluginJest.environments.globals.globals,
-    },
-  },
-  {
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-        ...globals.es2025,
-        Atomics: 'readonly',
-        SharedArrayBuffer: 'readonly',
-        document: 'readonly',
-        navigator: 'readonly',
-        window: 'readonly',
-      },
-      parserOptions: {
-        project: './tsconfig.eslint.json',
-        tsconfigRootDir: './',
-      },
-    },
-  },
-  {
-    ignores: ['src/diff2html-templates.*', 'coverage/', 'docs/', 'bundles-out/', 'bundles/', 'lib/', 'lib-esm/'],
-  },
-  {
-    ...tseslint.configs.disableTypeChecked,
-    files: ['**/*.{js,mjs,cjs}'],
-  },
-];

jest.config.js

@@ -19,5 +19,4 @@ module.exports = {
       lines: 93,
     },
   },
-  prettierPath: require.resolve('prettier-2'),
 };

package.json

@@ -35,35 +35,35 @@
     "node": ">=12"
   },
   "scripts": {
-    "lint:staged": "lint-staged",
-    "lint:check": "eslint",
-    "lint:fix": "eslint --fix",
+    "eslint": "eslint --ignore-path .gitignore \"**/*.{js,jsx,ts,tsx,json}\"",
+    "lint:check": "yarn run eslint",
+    "lint:fix": "yarn run eslint --fix",
     "prettier": "prettier --ignore-path .gitignore '**/*.+(js|jsx|ts|tsx|json|css|html|md|mdx)'",
-    "format:check": "npm run prettier --check",
-    "format:fix": "npm run prettier --write",
-    "build": "npm run build:css && npm run build:templates && npm run build:commonjs && npm run build:esm && npm run build:bundles && npm run build:website",
-    "build:commonjs": "rm -rf lib; tsc -p tsconfig.json -m CommonJS --outDir lib",
-    "build:esm": "rm -rf lib-esm; tsc -p tsconfig.json -m ESNext --outDir lib-esm",
+    "format:check": "yarn run prettier --check",
+    "format:fix": "yarn run prettier --write",
+    "build": "yarn run build:css && yarn run build:templates && yarn run build:es5 && yarn run build:esm && yarn run build:bundles && yarn run build:website",
+    "build:es5": "rm -rf lib; tsc -p tsconfig.json --outDir lib",
+    "build:esm": "rm -rf lib-esm; tsc -p tsconfig.json -m es6 --outDir lib-esm",
     "build:bundles": "rm -rf ./bundles/js; webpack --mode production --config webpack.bundles.ts",
     "build:css": "rm -rf ./bundles/css; postcss --config ./postcss.config.js --no-map -o ./bundles/css/diff2html.min.css ./src/ui/css/diff2html.css",
     "build:templates": "ts-node ./scripts/hulk.ts --wrapper ts --variable 'defaultTemplates' ./src/templates/*.mustache > ./src/diff2html-templates.ts",
     "build:website": "rm -rf docs; webpack --mode production --config webpack.website.ts",
-    "gen": "npm run gen:toc",
+    "gen": "yarn run gen:toc",
     "gen:toc-base": "markdown-toc --maxdepth 3 --bullets='-' -i",
-    "gen:toc": "npm run gen:toc-base README.md",
+    "gen:toc": "yarn run gen:toc-base README.md",
     "test": "is-ci 'test:coverage' 'test:watch'",
     "test:coverage": "jest --coverage",
     "test:watch": "jest --watch",
     "test:debug": "node --inspect-brk ./node_modules/jest/bin/jest.js --runInBand --watch",
-    "coverage:open": "npm run test:coverage && open ./coverage/index.html",
+    "coverage:open": "yarn run test:coverage && open ./coverage/index.html",
     "coverage:push": "curl -Ls https://coverage.codacy.com/get.sh | bash",
-    "validate": "npm run build:templates && npm run format:check && npm run lint:check && npm run build && npm run test:coverage",
-    "fix": "npm run format:fix && npm run lint:fix",
-    "start": "npm run start:website",
-    "start:website": "webpack serve --mode development --config webpack.website.ts",
-    "preversion": "npm run validate",
+    "validate": "yarn run build:templates && yarn run format:check && yarn run lint:check && yarn run build && yarn run test:coverage",
+    "fix": "yarn run format:fix && yarn run lint:fix",
+    "start": "yarn run start:website",
+    "start:website": "webpack-dev-server --mode development --config webpack.website.ts",
+    "preversion": "yarn run validate",
     "version": "git add -A package.json",
-    "prepare": "husky"
+    "prepare": "husky install"
   },
   "main": "./lib/diff2html.js",
   "module": "./lib-esm/diff2html.js",
@@ -77,65 +77,67 @@
       "prettier --write"
     ],
     "README.md": [
-      "npm run gen:toc-base"
+      "yarn run gen:toc-base"
     ]
   },
   "dependencies": {
-    "diff": "^7.0.0",
-    "hogan.js": "3.0.2"
+    "diff": "5.1.0",
+    "wontache": "0.1.0"
   },
   "optionalDependencies": {
-    "highlight.js": "11.9.0"
+    "highlight.js": "11.6.0"
   },
   "devDependencies": {
-    "prettier-2": "npm:prettier@^2",
-    "@eslint/js": "^9.17.0",
-    "@eslint/json": "^0.9.0",
-    "@types/diff": "^6.0.0",
-    "@types/hogan.js": "3.0.5",
-    "@types/jest": "^29.5.14",
-    "@types/node": "^22.10.2",
-    "@types/nopt": "3.0.32",
-    "all-contributors-cli": "^6.24.0",
-    "autoprefixer": "^10.4.20",
-    "bulma": "^1.0.2",
+    "@types/diff": "5.0.2",
+    "@types/jest": "28.1.6",
+    "@types/mkdirp": "1.0.2",
+    "@types/node": "18.6.0",
+    "@types/nopt": "3.0.29",
+    "@typescript-eslint/eslint-plugin": "5.30.7",
+    "@typescript-eslint/parser": "5.30.7",
+    "all-contributors-cli": "^6.20.0",
+    "autoprefixer": "10.4.7",
+    "bulma": "^0.9.4",
     "clipboard": "2.0.11",
-    "copy-webpack-plugin": "^12.0.2",
-    "css-loader": "^7.1.2",
-    "cssnano": "^7.0.6",
-    "eslint": "^9.17.0",
-    "eslint-plugin-jest": "28.10.0",
-    "eslint-plugin-promise": "^7.2.1",
+    "copy-webpack-plugin": "11.0.0",
+    "css-loader": "6.7.1",
+    "cssnano": "5.1.12",
+    "eslint": "8.20.0",
+    "eslint-config-prettier": "8.5.0",
+    "eslint-plugin-import": "2.26.0",
+    "eslint-plugin-jest": "26.6.0",
+    "eslint-plugin-json": "3.1.0",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-optimize-regex": "1.2.1",
+    "eslint-plugin-promise": "6.0.0",
+    "eslint-plugin-sonarjs": "0.14.0",
     "file-loader": "6.2.0",
-    "globals": "^15.14.0",
-    "handlebars": "4.7.8",
-    "handlebars-loader": "1.7.3",
-    "html-webpack-plugin": "^5.6.3",
-    "husky": "^9.1.7",
+    "handlebars": "4.7.7",
+    "handlebars-loader": "1.7.2",
+    "html-webpack-plugin": "5.5.0",
+    "husky": "^8.0.1",
     "image-webpack-loader": "8.1.0",
     "is-ci-cli": "2.2.0",
-    "jest": "29.7.0",
-    "lint-staged": "^15.2.11",
+    "jest": "28.1.3",
+    "lint-staged": "13.0.3",
     "markdown-toc": "^1.2.0",
-    "mini-css-extract-plugin": "^2.9.2",
-    "mkdirp": "3.0.1",
-    "nopt": "^8.0.0",
-    "postcss": "^8.4.49",
-    "postcss-cli": "11.0.0",
-    "postcss-import": "^16.1.0",
-    "postcss-loader": "^8.1.1",
-    "postcss-preset-env": "^10.1.2",
-    "prettier": "^3.4.2",
-    "ts-jest": "^29.2.5",
-    "ts-loader": "9.5.1",
-    "ts-node": "10.9.2",
-    "typescript": "^5.7.2",
-    "typescript-eslint": "^8.18.2",
+    "mini-css-extract-plugin": "2.6.1",
+    "mkdirp": "1.0.4",
+    "nopt": "6.0.0",
+    "postcss": "8.4.14",
+    "postcss-cli": "10.0.0",
+    "postcss-import": "14.1.0",
+    "postcss-loader": "7.0.1",
+    "postcss-preset-env": "7.7.2",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.7",
+    "ts-loader": "9.3.1",
+    "ts-node": "10.9.1",
+    "typescript": "4.7.4",
     "url-loader": "4.1.1",
-    "webpack": "^5.97.1",
-    "webpack-cli": "^6.0.1",
-    "webpack-dev-server": "^5.2.0",
-    "whatwg-fetch": "3.6.20"
+    "webpack": "5.73.0",
+    "webpack-cli": "4.10.0",
+    "whatwg-fetch": "3.6.2"
   },
   "resolutions": {
     "lodash": ">=4.17.20",
@@ -148,8 +150,7 @@
     "trim-newlines": ">=3.0.1",
     "async": ">=2.6.4",
     "terser": ">=5.14.2",
-    "semver-regex": ">=4.0.5",
-    "http-cache-semantics": ">=4.1.1"
+    "semver-regex": ">=4.0.5"
   },
   "license": "MIT",
   "files": [

scripts/hulk.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/triple-slash-reference
+/// <reference path="../typings/wontache/wontache.d.ts" />
 /*
  *  Copyright 2011 Twitter, Inc.
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +18,7 @@
 import * as path from 'path';
 import * as fs from 'fs';
 
-import * as hogan from 'hogan.js';
+import mustache from 'wontache';
 import nopt from 'nopt';
 import * as mkderp from 'mkdirp';
 
@@ -67,7 +69,7 @@ function extractFiles(files: string[]): string[] {
   `;
 
   if (options.version) {
-    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     console.log(require('../package.json').version);
     process.exit(0);
   }
@@ -107,25 +109,20 @@ function removeByteOrderMark(text: string): string {
 }
 
 // Wrap templates
-function wrap(file: string, name: string, openedFile: string): string {
-  const hoganTemplateString = `new Hogan.Template(${hogan.compile(openedFile, { asString: true })})`;
+function wrap(name: string, openedFile: string): string {
+  const templateString = mustache(openedFile).source;
 
   const objectName = options.variable || 'templates';
   const objectAccessor = `${objectName}["${name}"]`;
-  const objectStmt = `${objectAccessor} = ${hoganTemplateString};`;
+  const objectStmt = `${objectAccessor} = ${templateString};`;
 
   switch (options.wrapper) {
-    case 'amd':
-      return `define(${
-        !options.outputdir ? `"${path.join(path.dirname(file), name)}", ` : ''
-      }["hogan.js"], function(Hogan) { return ${hoganTemplateString}; });`;
-
     case 'node':
       // If we have a template per file the export will expose the template directly
       return options.outputdir ? `global.${objectStmt};\nmodule.exports = ${objectAccessor};` : `global.${objectStmt}`;
 
     case 'ts':
-      return `// @ts-ignore\n${objectStmt}`;
+      return `// eslint-disable-next-line @typescript-eslint/ban-ts-comment\n// @ts-ignore\n${objectStmt}`;
     default:
       return objectStmt;
   }
@@ -137,16 +134,18 @@ function prepareOutput(content: string): string {
     case 'amd':
       return content;
     case 'node':
-      return `(function() {
+      return `const mustache = require('wontache');
+(function() {
 if (!!!global.${variableName}) global.${variableName} = {};
-var Hogan = require("hogan.js");
 ${content}
 ${!options.outputdir ? `module.exports = global.${variableName};\n` : ''})();`;
 
     case 'ts':
-      return `import * as Hogan from "hogan.js";
-type CompiledTemplates = { [name: string]: Hogan.Template };
-export const ${variableName}: CompiledTemplates = {};
+      return `/* eslint-disable @typescript-eslint/no-unused-vars */
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
+import mustache, { CompiledTemplate } from 'wontache';
+export const defaultTemplates: { [_: string]: CompiledTemplate } = {};
 ${content}`;
 
     default:
@@ -172,7 +171,7 @@ const templates = extractFiles(options.argv.remain)
     if (!timmedFileContents) return;
 
     const name = namespace(path.basename(file).replace(/\..*$/, ''));
-    const cleanFileContents = wrap(file, name, removeByteOrderMark(timmedFileContents));
+    const cleanFileContents = wrap(name, removeByteOrderMark(timmedFileContents));
 
     if (!options.outputdir) return cleanFileContents;
 

src/__tests__/file-list-printer-tests.ts

@@ -0,0 +1,176 @@
+import { render } from '../file-list-renderer';
+import HoganJsUtils from '../hoganjs-utils';
+
+describe('FileListPrinter', () => {
+  describe('generateFileList', () => {
+    it('should expose old and new files to templates', () => {
+      const hoganUtils = new HoganJsUtils({
+        rawTemplates: {
+          'file-summary-wrapper': '{{{files}}}',
+          'file-summary-line': '{{oldName}}, {{newName}}, {{fileName}}',
+        },
+      });
+      const files = [
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 12,
+          deletedLines: 41,
+          language: 'js',
+          oldName: 'my/file/name.js',
+          newName: 'my/file/name.js',
+        },
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 12,
+          deletedLines: 41,
+          language: 'js',
+          oldName: 'my/file/name1.js',
+          newName: 'my/file/name2.js',
+        },
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 12,
+          deletedLines: 0,
+          language: 'js',
+          oldName: 'dev/null',
+          newName: 'my/file/name.js',
+          isNew: true,
+        },
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 0,
+          deletedLines: 41,
+          language: 'js',
+          oldName: 'my/file/name.js',
+          newName: 'dev/null',
+          isDeleted: true,
+        },
+      ];
+
+      const fileHtml = render(files, hoganUtils);
+
+      expect(fileHtml).toMatchInlineSnapshot(`
+        "my/file/name.js, my/file/name.js, my/file/name.js
+        my/file/name1.js, my/file/name2.js, my/file/{name1.js → name2.js}
+        dev/null, my/file/name.js, my/file/name.js
+        my/file/name.js, dev/null, my/file/name.js"
+      `);
+    });
+
+    it('should work for all kinds of files', () => {
+      const hoganUtils = new HoganJsUtils({});
+      const files = [
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 12,
+          deletedLines: 41,
+          language: 'js',
+          oldName: 'my/file/name.js',
+          newName: 'my/file/name.js',
+        },
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 12,
+          deletedLines: 41,
+          language: 'js',
+          oldName: 'my/file/name1.js',
+          newName: 'my/file/name2.js',
+        },
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 12,
+          deletedLines: 0,
+          language: 'js',
+          oldName: 'dev/null',
+          newName: 'my/file/name.js',
+          isNew: true,
+        },
+        {
+          isCombined: false,
+          isGitDiff: false,
+          blocks: [],
+          addedLines: 0,
+          deletedLines: 41,
+          language: 'js',
+          oldName: 'my/file/name.js',
+          newName: 'dev/null',
+          isDeleted: true,
+        },
+      ];
+      const fileHtml = render(files, hoganUtils);
+      expect(fileHtml).toMatchInlineSnapshot(`
+        "<div class=\\"d2h-file-list-wrapper\\">
+            <div class=\\"d2h-file-list-header\\">
+                <span class=\\"d2h-file-list-title\\">Files changed (4)</span>
+                <a class=\\"d2h-file-switch d2h-hide\\">hide</a>
+                <a class=\\"d2h-file-switch d2h-show\\">show</a>
+            </div>
+            <ol class=\\"d2h-file-list\\">
+            <li class=\\"d2h-file-list-line\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+              <svg aria-hidden=\\"true\\" class=\\"d2h-icon d2h-changed\\" height=\\"16\\" title=\\"modified\\" version=\\"1.1\\"
+                   viewBox=\\"0 0 14 16\\" width=\\"14\\">
+                  <path d=\\"M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM4 8c0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3-3-1.34-3-3z\\"></path>
+              </svg>      <a href=\\"#d2h-781444\\" class=\\"d2h-file-name\\">my/file/name.js</a>
+              <span class=\\"d2h-file-stats\\">
+                  <span class=\\"d2h-lines-added\\">+12</span>
+                  <span class=\\"d2h-lines-deleted\\">-41</span>
+              </span>
+            </span>
+        </li>
+        <li class=\\"d2h-file-list-line\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+              <svg aria-hidden=\\"true\\" class=\\"d2h-icon d2h-moved\\" height=\\"16\\" title=\\"renamed\\" version=\\"1.1\\"
+                   viewBox=\\"0 0 14 16\\" width=\\"14\\">
+                  <path d=\\"M6 9H3V7h3V4l5 4-5 4V9z m8-7v12c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h12c0.55 0 1 0.45 1 1z m-1 0H1v12h12V2z\\"></path>
+              </svg>      <a href=\\"#d2h-662683\\" class=\\"d2h-file-name\\">my/file/{name1.js → name2.js}</a>
+              <span class=\\"d2h-file-stats\\">
+                  <span class=\\"d2h-lines-added\\">+12</span>
+                  <span class=\\"d2h-lines-deleted\\">-41</span>
+              </span>
+            </span>
+        </li>
+        <li class=\\"d2h-file-list-line\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+              <svg aria-hidden=\\"true\\" class=\\"d2h-icon d2h-added\\" height=\\"16\\" title=\\"added\\" version=\\"1.1\\" viewBox=\\"0 0 14 16\\"
+                   width=\\"14\\">
+                  <path d=\\"M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM6 9H3V7h3V4h2v3h3v2H8v3H6V9z\\"></path>
+              </svg>      <a href=\\"#d2h-781444\\" class=\\"d2h-file-name\\">my/file/name.js</a>
+              <span class=\\"d2h-file-stats\\">
+                  <span class=\\"d2h-lines-added\\">+12</span>
+                  <span class=\\"d2h-lines-deleted\\">-0</span>
+              </span>
+            </span>
+        </li>
+        <li class=\\"d2h-file-list-line\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+              <svg aria-hidden=\\"true\\" class=\\"d2h-icon d2h-deleted\\" height=\\"16\\" title=\\"removed\\" version=\\"1.1\\"
+                   viewBox=\\"0 0 14 16\\" width=\\"14\\">
+                  <path d=\\"M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM11 9H3V7h8v2z\\"></path>
+              </svg>      <a href=\\"#d2h-781444\\" class=\\"d2h-file-name\\">my/file/name.js</a>
+              <span class=\\"d2h-file-stats\\">
+                  <span class=\\"d2h-lines-added\\">+0</span>
+                  <span class=\\"d2h-lines-deleted\\">-41</span>
+              </span>
+            </span>
+        </li>
+            </ol>
+        </div>"
+      `);
+    });
+  });
+});

src/__tests__/file-list-renderer-tests.ts

@@ -1,272 +0,0 @@
-import { FileListRenderer } from '../file-list-renderer';
-import HoganJsUtils from '../hoganjs-utils';
-import { ColorSchemeType } from '../types';
-
-describe('FileListRenderer', () => {
-  describe('render', () => {
-    it('should expose old and new files to templates', () => {
-      const hoganUtils = new HoganJsUtils({
-        rawTemplates: {
-          'file-summary-wrapper': '{{{files}}}',
-          'file-summary-line': '{{oldName}}, {{newName}}, {{fileName}}',
-        },
-      });
-      const fileListRenderer = new FileListRenderer(hoganUtils);
-      const files = [
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 12,
-          deletedLines: 41,
-          language: 'js',
-          oldName: 'my/file/name.js',
-          newName: 'my/file/name.js',
-        },
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 12,
-          deletedLines: 41,
-          language: 'js',
-          oldName: 'my/file/name1.js',
-          newName: 'my/file/name2.js',
-        },
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 12,
-          deletedLines: 0,
-          language: 'js',
-          oldName: 'dev/null',
-          newName: 'my/file/name.js',
-          isNew: true,
-        },
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 0,
-          deletedLines: 41,
-          language: 'js',
-          oldName: 'my/file/name.js',
-          newName: 'dev/null',
-          isDeleted: true,
-        },
-      ];
-
-      const fileHtml = fileListRenderer.render(files);
-
-      expect(fileHtml).toMatchInlineSnapshot(`
-        "my/file/name.js, my/file/name.js, my/file/name.js
-        my/file/name1.js, my/file/name2.js, my/file/{name1.js → name2.js}
-        dev/null, my/file/name.js, my/file/name.js
-        my/file/name.js, dev/null, my/file/name.js"
-      `);
-    });
-
-    it('should work for all kinds of files', () => {
-      const hoganUtils = new HoganJsUtils({});
-      const fileListRenderer = new FileListRenderer(hoganUtils);
-
-      const files = [
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 12,
-          deletedLines: 41,
-          language: 'js',
-          oldName: 'my/file/name.js',
-          newName: 'my/file/name.js',
-        },
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 12,
-          deletedLines: 41,
-          language: 'js',
-          oldName: 'my/file/name1.js',
-          newName: 'my/file/name2.js',
-        },
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 12,
-          deletedLines: 0,
-          language: 'js',
-          oldName: 'dev/null',
-          newName: 'my/file/name.js',
-          isNew: true,
-        },
-        {
-          isCombined: false,
-          isGitDiff: false,
-          blocks: [],
-          addedLines: 0,
-          deletedLines: 41,
-          language: 'js',
-          oldName: 'my/file/name.js',
-          newName: 'dev/null',
-          isDeleted: true,
-        },
-      ];
-      const fileHtml = fileListRenderer.render(files);
-      expect(fileHtml).toMatchInlineSnapshot(`
-        "<div class="d2h-file-list-wrapper d2h-light-color-scheme">
-            <div class="d2h-file-list-header">
-                <span class="d2h-file-list-title">Files changed (4)</span>
-                <a class="d2h-file-switch d2h-hide">hide</a>
-                <a class="d2h-file-switch d2h-show">show</a>
-            </div>
-            <ol class="d2h-file-list">
-            <li class="d2h-file-list-line">
-            <span class="d2h-file-name-wrapper">
-              <svg aria-hidden="true" class="d2h-icon d2h-changed" height="16" title="modified" version="1.1"
-                   viewBox="0 0 14 16" width="14">
-                  <path d="M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM4 8c0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3-3-1.34-3-3z"></path>
-              </svg>      <a href="#d2h-781444" class="d2h-file-name">my/file/name.js</a>
-              <span class="d2h-file-stats">
-                  <span class="d2h-lines-added">+12</span>
-                  <span class="d2h-lines-deleted">-41</span>
-              </span>
-            </span>
-        </li>
-        <li class="d2h-file-list-line">
-            <span class="d2h-file-name-wrapper">
-              <svg aria-hidden="true" class="d2h-icon d2h-moved" height="16" title="renamed" version="1.1"
-                   viewBox="0 0 14 16" width="14">
-                  <path d="M6 9H3V7h3V4l5 4-5 4V9z m8-7v12c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h12c0.55 0 1 0.45 1 1z m-1 0H1v12h12V2z"></path>
-              </svg>      <a href="#d2h-662683" class="d2h-file-name">my/file/{name1.js → name2.js}</a>
-              <span class="d2h-file-stats">
-                  <span class="d2h-lines-added">+12</span>
-                  <span class="d2h-lines-deleted">-41</span>
-              </span>
-            </span>
-        </li>
-        <li class="d2h-file-list-line">
-            <span class="d2h-file-name-wrapper">
-              <svg aria-hidden="true" class="d2h-icon d2h-added" height="16" title="added" version="1.1" viewBox="0 0 14 16"
-                   width="14">
-                  <path d="M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM6 9H3V7h3V4h2v3h3v2H8v3H6V9z"></path>
-              </svg>      <a href="#d2h-781444" class="d2h-file-name">my/file/name.js</a>
-              <span class="d2h-file-stats">
-                  <span class="d2h-lines-added">+12</span>
-                  <span class="d2h-lines-deleted">-0</span>
-              </span>
-            </span>
-        </li>
-        <li class="d2h-file-list-line">
-            <span class="d2h-file-name-wrapper">
-              <svg aria-hidden="true" class="d2h-icon d2h-deleted" height="16" title="removed" version="1.1"
-                   viewBox="0 0 14 16" width="14">
-                  <path d="M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM11 9H3V7h8v2z"></path>
-              </svg>      <a href="#d2h-781444" class="d2h-file-name">my/file/name.js</a>
-              <span class="d2h-file-stats">
-                  <span class="d2h-lines-added">+0</span>
-                  <span class="d2h-lines-deleted">-41</span>
-              </span>
-            </span>
-        </li>
-            </ol>
-        </div>"
-      `);
-    });
-
-    describe('with dark colorScheme', () => {
-      it('should include dark colorScheme', () => {
-        const hoganUtils = new HoganJsUtils({});
-        const fileListRenderer = new FileListRenderer(hoganUtils, {
-          colorScheme: ColorSchemeType.DARK,
-        });
-
-        const files = [
-          {
-            isCombined: false,
-            isGitDiff: false,
-            blocks: [],
-            addedLines: 12,
-            deletedLines: 41,
-            language: 'js',
-            oldName: 'my/file/name.js',
-            newName: 'my/file/name.js',
-          },
-        ];
-        const fileHtml = fileListRenderer.render(files);
-        expect(fileHtml).toMatchInlineSnapshot(`
-          "<div class="d2h-file-list-wrapper d2h-dark-color-scheme">
-              <div class="d2h-file-list-header">
-                  <span class="d2h-file-list-title">Files changed (1)</span>
-                  <a class="d2h-file-switch d2h-hide">hide</a>
-                  <a class="d2h-file-switch d2h-show">show</a>
-              </div>
-              <ol class="d2h-file-list">
-              <li class="d2h-file-list-line">
-              <span class="d2h-file-name-wrapper">
-                <svg aria-hidden="true" class="d2h-icon d2h-changed" height="16" title="modified" version="1.1"
-                     viewBox="0 0 14 16" width="14">
-                    <path d="M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM4 8c0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3-3-1.34-3-3z"></path>
-                </svg>      <a href="#d2h-781444" class="d2h-file-name">my/file/name.js</a>
-                <span class="d2h-file-stats">
-                    <span class="d2h-lines-added">+12</span>
-                    <span class="d2h-lines-deleted">-41</span>
-                </span>
-              </span>
-          </li>
-              </ol>
-          </div>"
-        `);
-      });
-    });
-
-    describe('with auto colorScheme', () => {
-      it('should include auto colorScheme', () => {
-        const hoganUtils = new HoganJsUtils({});
-        const fileListRenderer = new FileListRenderer(hoganUtils, {
-          colorScheme: ColorSchemeType.AUTO,
-        });
-
-        const files = [
-          {
-            isCombined: false,
-            isGitDiff: false,
-            blocks: [],
-            addedLines: 12,
-            deletedLines: 41,
-            language: 'js',
-            oldName: 'my/file/name.js',
-            newName: 'my/file/name.js',
-          },
-        ];
-        const fileHtml = fileListRenderer.render(files);
-        expect(fileHtml).toMatchInlineSnapshot(`
-          "<div class="d2h-file-list-wrapper d2h-auto-color-scheme">
-              <div class="d2h-file-list-header">
-                  <span class="d2h-file-list-title">Files changed (1)</span>
-                  <a class="d2h-file-switch d2h-hide">hide</a>
-                  <a class="d2h-file-switch d2h-show">show</a>
-              </div>
-              <ol class="d2h-file-list">
-              <li class="d2h-file-list-line">
-              <span class="d2h-file-name-wrapper">
-                <svg aria-hidden="true" class="d2h-icon d2h-changed" height="16" title="modified" version="1.1"
-                     viewBox="0 0 14 16" width="14">
-                    <path d="M13 1H1C0.45 1 0 1.45 0 2v12c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1V2c0-0.55-0.45-1-1-1z m0 13H1V2h12v12zM4 8c0-1.66 1.34-3 3-3s3 1.34 3 3-1.34 3-3 3-3-1.34-3-3z"></path>
-                </svg>      <a href="#d2h-781444" class="d2h-file-name">my/file/name.js</a>
-                <span class="d2h-file-stats">
-                    <span class="d2h-lines-added">+12</span>
-                    <span class="d2h-lines-deleted">-41</span>
-                </span>
-              </span>
-          </li>
-              </ol>
-          </div>"
-        `);
-      });
-    });
-  });
-});

src/__tests__/hogan-cache-tests.ts

@@ -11,8 +11,8 @@ describe('HoganJsUtils', () => {
       });
       expect(result).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-info">
-                <div class="d2h-code-line">
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-line\\">
                     File without changes
                 </div>
             </td>

src/__tests__/line-by-line-tests.ts

@@ -11,8 +11,8 @@ describe('LineByLineRenderer', () => {
       const fileHtml = lineByLineRenderer.generateEmptyDiff();
       expect(fileHtml).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-info">
-                <div class="d2h-code-line">
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-line\\">
                     File without changes
                 </div>
             </td>
@@ -23,19 +23,9 @@ describe('LineByLineRenderer', () => {
 
   describe('makeLineHtml', () => {
     it('should work for insertions', () => {
-      const file = {
-        addedLines: 12,
-        deletedLines: 41,
-        language: 'js',
-        oldName: 'my/file/name.js',
-        newName: 'my/file/name.js',
-        isCombined: false,
-        isGitDiff: false,
-        blocks: [],
-      };
       const hoganUtils = new HoganJsUtils({});
       const lineByLineRenderer = new LineByLineRenderer(hoganUtils, {});
-      const fileHtml = lineByLineRenderer.generateSingleLineHtml(file, {
+      const fileHtml = lineByLineRenderer.generateSingleLineHtml({
         type: CSSLineClass.INSERTS,
         prefix: '+',
         content: 'test',
@@ -44,14 +34,14 @@ describe('LineByLineRenderer', () => {
       });
       expect(fileHtml).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-code-linenumber d2h-ins">
-              <div class="line-num1"></div>
-        <div class="line-num2">30</div>
+            <td class=\\"d2h-code-linenumber d2h-ins\\">
+              <div class=\\"line-num1\\"></div>
+        <div class=\\"line-num2\\">30</div>
             </td>
-            <td class="d2h-ins">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">test</span>
+            <td class=\\"d2h-ins\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\">test</span>
                 </div>
             </td>
         </tr>"
@@ -59,19 +49,9 @@ describe('LineByLineRenderer', () => {
     });
 
     it('should work for deletions', () => {
-      const file = {
-        addedLines: 12,
-        deletedLines: 41,
-        language: 'js',
-        oldName: 'my/file/name.js',
-        newName: 'my/file/name.js',
-        isCombined: false,
-        isGitDiff: false,
-        blocks: [],
-      };
       const hoganUtils = new HoganJsUtils({});
       const lineByLineRenderer = new LineByLineRenderer(hoganUtils, {});
-      const fileHtml = lineByLineRenderer.generateSingleLineHtml(file, {
+      const fileHtml = lineByLineRenderer.generateSingleLineHtml({
         type: CSSLineClass.DELETES,
         prefix: '-',
         content: 'test',
@@ -80,14 +60,14 @@ describe('LineByLineRenderer', () => {
       });
       expect(fileHtml).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-code-linenumber d2h-del">
-              <div class="line-num1">30</div>
-        <div class="line-num2"></div>
+            <td class=\\"d2h-code-linenumber d2h-del\\">
+              <div class=\\"line-num1\\">30</div>
+        <div class=\\"line-num2\\"></div>
             </td>
-            <td class="d2h-del">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn">test</span>
+            <td class=\\"d2h-del\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">-</span>
+                    <span class=\\"d2h-code-line-ctn\\">test</span>
                 </div>
             </td>
         </tr>"
@@ -95,19 +75,9 @@ describe('LineByLineRenderer', () => {
     });
 
     it('should convert indents into non breakin spaces (2 white spaces)', () => {
-      const file = {
-        addedLines: 12,
-        deletedLines: 41,
-        language: 'js',
-        oldName: 'my/file/name.js',
-        newName: 'my/file/name.js',
-        isCombined: false,
-        isGitDiff: false,
-        blocks: [],
-      };
       const hoganUtils = new HoganJsUtils({});
       const lineByLineRenderer = new LineByLineRenderer(hoganUtils, {});
-      const fileHtml = lineByLineRenderer.generateSingleLineHtml(file, {
+      const fileHtml = lineByLineRenderer.generateSingleLineHtml({
         type: CSSLineClass.INSERTS,
         prefix: '+',
         content: '  test',
@@ -116,14 +86,14 @@ describe('LineByLineRenderer', () => {
       });
       expect(fileHtml).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-code-linenumber d2h-ins">
-              <div class="line-num1"></div>
-        <div class="line-num2">30</div>
+            <td class=\\"d2h-code-linenumber d2h-ins\\">
+              <div class=\\"line-num1\\"></div>
+        <div class=\\"line-num2\\">30</div>
             </td>
-            <td class="d2h-ins">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">  test</span>
+            <td class=\\"d2h-ins\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\">  test</span>
                 </div>
             </td>
         </tr>"
@@ -131,19 +101,9 @@ describe('LineByLineRenderer', () => {
     });
 
     it('should convert indents into non breakin spaces (4 white spaces)', () => {
-      const file = {
-        addedLines: 12,
-        deletedLines: 41,
-        language: 'js',
-        oldName: 'my/file/name.js',
-        newName: 'my/file/name.js',
-        isCombined: false,
-        isGitDiff: false,
-        blocks: [],
-      };
       const hoganUtils = new HoganJsUtils({});
       const lineByLineRenderer = new LineByLineRenderer(hoganUtils, {});
-      const fileHtml = lineByLineRenderer.generateSingleLineHtml(file, {
+      const fileHtml = lineByLineRenderer.generateSingleLineHtml({
         type: CSSLineClass.INSERTS,
         prefix: '+',
         content: '    test',
@@ -152,14 +112,14 @@ describe('LineByLineRenderer', () => {
       });
       expect(fileHtml).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-code-linenumber d2h-ins">
-              <div class="line-num1"></div>
-        <div class="line-num2">30</div>
+            <td class=\\"d2h-code-linenumber d2h-ins\\">
+              <div class=\\"line-num1\\"></div>
+        <div class=\\"line-num2\\">30</div>
             </td>
-            <td class="d2h-ins">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">    test</span>
+            <td class=\\"d2h-ins\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\">    test</span>
                 </div>
             </td>
         </tr>"
@@ -167,19 +127,9 @@ describe('LineByLineRenderer', () => {
     });
 
     it('should preserve tabs', () => {
-      const file = {
-        addedLines: 12,
-        deletedLines: 41,
-        language: 'js',
-        oldName: 'my/file/name.js',
-        newName: 'my/file/name.js',
-        isCombined: false,
-        isGitDiff: false,
-        blocks: [],
-      };
       const hoganUtils = new HoganJsUtils({});
       const lineByLineRenderer = new LineByLineRenderer(hoganUtils, {});
-      const fileHtml = lineByLineRenderer.generateSingleLineHtml(file, {
+      const fileHtml = lineByLineRenderer.generateSingleLineHtml({
         type: CSSLineClass.INSERTS,
         prefix: '+',
         content: '\ttest',
@@ -188,14 +138,14 @@ describe('LineByLineRenderer', () => {
       });
       expect(fileHtml).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-code-linenumber d2h-ins">
-              <div class="line-num1"></div>
-        <div class="line-num2">30</div>
+            <td class=\\"d2h-code-linenumber d2h-ins\\">
+              <div class=\\"line-num1\\"></div>
+        <div class=\\"line-num2\\">30</div>
             </td>
-            <td class="d2h-ins">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">	test</span>
+            <td class=\\"d2h-ins\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\">	test</span>
                 </div>
             </td>
         </tr>"
@@ -223,22 +173,22 @@ describe('LineByLineRenderer', () => {
       const fileHtml = lineByLineRenderer.makeFileDiffHtml(file, diffs);
 
       expect(fileHtml).toMatchInlineSnapshot(`
-        "<div id="d2h-781444" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-            <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">my/file/name.js</span>
-            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div id=\\"d2h-781444\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">my/file/name.js</span>
+            <span class=\\"d2h-tag d2h-changed d2h-changed-tag\\">CHANGED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-file-diff">
-                <div class="d2h-code-wrapper">
-                    <table class="d2h-diff-table">
-                        <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-file-diff\\">
+                <div class=\\"d2h-code-wrapper\\">
+                    <table class=\\"d2h-diff-table\\">
+                        <tbody class=\\"d2h-diff-tbody\\">
                         <span>Random Html</span>
                         </tbody>
                     </table>
@@ -267,22 +217,22 @@ describe('LineByLineRenderer', () => {
       const fileHtml = lineByLineRenderer.makeFileDiffHtml(file, diffs);
 
       expect(fileHtml).toMatchInlineSnapshot(`
-        "<div id="d2h-781444" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-            <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">my/file/name.js</span>
-            <span class="d2h-tag d2h-added d2h-added-tag">ADDED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div id=\\"d2h-781444\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">my/file/name.js</span>
+            <span class=\\"d2h-tag d2h-added d2h-added-tag\\">ADDED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-file-diff">
-                <div class="d2h-code-wrapper">
-                    <table class="d2h-diff-table">
-                        <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-file-diff\\">
+                <div class=\\"d2h-code-wrapper\\">
+                    <table class=\\"d2h-diff-table\\">
+                        <tbody class=\\"d2h-diff-tbody\\">
                         <span>Random Html</span>
                         </tbody>
                     </table>
@@ -311,22 +261,22 @@ describe('LineByLineRenderer', () => {
       const fileHtml = lineByLineRenderer.makeFileDiffHtml(file, diffs);
 
       expect(fileHtml).toMatchInlineSnapshot(`
-        "<div id="d2h-781444" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-            <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">my/file/name.js</span>
-            <span class="d2h-tag d2h-deleted d2h-deleted-tag">DELETED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div id=\\"d2h-781444\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">my/file/name.js</span>
+            <span class=\\"d2h-tag d2h-deleted d2h-deleted-tag\\">DELETED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-file-diff">
-                <div class="d2h-code-wrapper">
-                    <table class="d2h-diff-table">
-                        <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-file-diff\\">
+                <div class=\\"d2h-code-wrapper\\">
+                    <table class=\\"d2h-diff-table\\">
+                        <tbody class=\\"d2h-diff-tbody\\">
                         <span>Random Html</span>
                         </tbody>
                     </table>
@@ -355,22 +305,22 @@ describe('LineByLineRenderer', () => {
       const fileHtml = lineByLineRenderer.makeFileDiffHtml(file, diffs);
 
       expect(fileHtml).toMatchInlineSnapshot(`
-        "<div id="d2h-662683" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-            <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">my/file/{name1.js → name2.js}</span>
-            <span class="d2h-tag d2h-moved d2h-moved-tag">RENAMED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div id=\\"d2h-662683\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">my/file/{name1.js → name2.js}</span>
+            <span class=\\"d2h-tag d2h-moved d2h-moved-tag\\">RENAMED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-file-diff">
-                <div class="d2h-code-wrapper">
-                    <table class="d2h-diff-table">
-                        <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-file-diff\\">
+                <div class=\\"d2h-code-wrapper\\">
+                    <table class=\\"d2h-diff-table\\">
+                        <tbody class=\\"d2h-diff-tbody\\">
                         <span>Random Html</span>
                         </tbody>
                     </table>
@@ -449,48 +399,48 @@ describe('LineByLineRenderer', () => {
       });
       const html = lineByLineRenderer.render(exampleJson);
       expect(html).toMatchInlineSnapshot(`
-        "<div class="d2h-wrapper d2h-light-color-scheme">
-            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="txt">
-            <div class="d2h-file-header">
-            <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">sample</span>
-            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div class=\\"d2h-wrapper\\">
+            <div id=\\"d2h-675094\\" class=\\"d2h-file-wrapper\\" data-lang=\\"txt\\">
+            <div class=\\"d2h-file-header\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">sample</span>
+            <span class=\\"d2h-tag d2h-changed d2h-changed-tag\\">CHANGED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-file-diff">
-                <div class="d2h-code-wrapper">
-                    <table class="d2h-diff-table">
-                        <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-file-diff\\">
+                <div class=\\"d2h-code-wrapper\\">
+                    <table class=\\"d2h-diff-table\\">
+                        <tbody class=\\"d2h-diff-tbody\\">
                         <tr>
-            <td class="d2h-code-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-line">@@ -1 +1 @@</div>
+            <td class=\\"d2h-code-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-line\\">@@ -1 +1 @@</div>
             </td>
         </tr><tr>
-            <td class="d2h-code-linenumber d2h-del d2h-change">
-              <div class="line-num1">1</div>
-        <div class="line-num2"></div>
+            <td class=\\"d2h-code-linenumber d2h-del d2h-change\\">
+              <div class=\\"line-num1\\">1</div>
+        <div class=\\"line-num2\\"></div>
             </td>
-            <td class="d2h-del d2h-change">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn"><del>test</del></span>
+            <td class=\\"d2h-del d2h-change\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">-</span>
+                    <span class=\\"d2h-code-line-ctn\\"><del>test</del></span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-linenumber d2h-ins d2h-change">
-              <div class="line-num1"></div>
-        <div class="line-num2">1</div>
+            <td class=\\"d2h-code-linenumber d2h-ins d2h-change\\">
+              <div class=\\"line-num1\\"></div>
+        <div class=\\"line-num2\\">1</div>
             </td>
-            <td class="d2h-ins d2h-change">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn"><ins>test1r</ins></span>
+            <td class=\\"d2h-ins d2h-change\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\"><ins>test1r</ins></span>
                 </div>
             </td>
         </tr>
@@ -523,26 +473,26 @@ describe('LineByLineRenderer', () => {
       });
       const html = lineByLineRenderer.render(exampleJson);
       expect(html).toMatchInlineSnapshot(`
-        "<div class="d2h-wrapper d2h-light-color-scheme">
-            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-            <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">sample</span>
-            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div class=\\"d2h-wrapper\\">
+            <div id=\\"d2h-675094\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">sample</span>
+            <span class=\\"d2h-tag d2h-changed d2h-changed-tag\\">CHANGED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-file-diff">
-                <div class="d2h-code-wrapper">
-                    <table class="d2h-diff-table">
-                        <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-file-diff\\">
+                <div class=\\"d2h-code-wrapper\\">
+                    <table class=\\"d2h-diff-table\\">
+                        <tbody class=\\"d2h-diff-tbody\\">
                         <tr>
-            <td class="d2h-info">
-                <div class="d2h-code-line">
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-line\\">
                     File without changes
                 </div>
             </td>
@@ -583,27 +533,27 @@ describe('LineByLineRenderer', () => {
       const lineByLineRenderer = new LineByLineRenderer(hoganUtils);
       const html = lineByLineRenderer.render(exampleJson);
       expect(html).toMatchInlineSnapshot(`
-        "<div class="d2h-wrapper d2h-light-color-scheme">
-            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-            <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">sample</span>
-            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div class=\\"d2h-wrapper\\">
+            <div id=\\"d2h-675094\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+            <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">sample</span>
+            <span class=\\"d2h-tag d2h-changed d2h-changed-tag\\">CHANGED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-file-diff">
-                <div class="d2h-code-wrapper">
-                    <table class="d2h-diff-table">
-                        <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-file-diff\\">
+                <div class=\\"d2h-code-wrapper\\">
+                    <table class=\\"d2h-diff-table\\">
+                        <tbody class=\\"d2h-diff-tbody\\">
                         <tr>
-            <td class="d2h-code-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-line"><a href="http://example.com">Custom link to render</a></div>
+            <td class=\\"d2h-code-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-line\\"><a href=\\"http://example.com\\">Custom link to render</a></div>
             </td>
         </tr>
                         </tbody>
@@ -670,52 +620,52 @@ describe('LineByLineRenderer', () => {
 
       expect(html).toMatchInlineSnapshot(`
         "<tr>
-            <td class="d2h-code-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-line">@@ -1 +1 @@</div>
+            <td class=\\"d2h-code-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-line\\">@@ -1 +1 @@</div>
             </td>
         </tr><tr>
-            <td class="d2h-code-linenumber d2h-cntx">
-              <div class="line-num1">1</div>
-        <div class="line-num2">1</div>
+            <td class=\\"d2h-code-linenumber d2h-cntx\\">
+              <div class=\\"line-num1\\">1</div>
+        <div class=\\"line-num2\\">1</div>
             </td>
-            <td class="d2h-cntx">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">&nbsp;</span>
-                    <span class="d2h-code-line-ctn">one context line</span>
+            <td class=\\"d2h-cntx\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
+                    <span class=\\"d2h-code-line-ctn\\">one context line</span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-linenumber d2h-del d2h-change">
-              <div class="line-num1">2</div>
-        <div class="line-num2"></div>
+            <td class=\\"d2h-code-linenumber d2h-del d2h-change\\">
+              <div class=\\"line-num1\\">2</div>
+        <div class=\\"line-num2\\"></div>
             </td>
-            <td class="d2h-del d2h-change">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn"><del>test</del></span>
+            <td class=\\"d2h-del d2h-change\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">-</span>
+                    <span class=\\"d2h-code-line-ctn\\"><del>test</del></span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-linenumber d2h-ins d2h-change">
-              <div class="line-num1"></div>
-        <div class="line-num2">2</div>
+            <td class=\\"d2h-code-linenumber d2h-ins d2h-change\\">
+              <div class=\\"line-num1\\"></div>
+        <div class=\\"line-num2\\">2</div>
             </td>
-            <td class="d2h-ins d2h-change">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn"><ins>test1r</ins></span>
+            <td class=\\"d2h-ins d2h-change\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\"><ins>test1r</ins></span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-linenumber d2h-ins">
-              <div class="line-num1"></div>
-        <div class="line-num2">3</div>
+            <td class=\\"d2h-code-linenumber d2h-ins\\">
+              <div class=\\"line-num1\\"></div>
+        <div class=\\"line-num2\\">3</div>
             </td>
-            <td class="d2h-ins">
-                <div class="d2h-code-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">test2r</span>
+            <td class=\\"d2h-ins\\">
+                <div class=\\"d2h-code-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\">test2r</span>
                 </div>
             </td>
         </tr>"

src/__tests__/side-by-side-printer-tests.ts

@@ -10,10 +10,10 @@ describe('SideBySideRenderer', () => {
       const sideBySideRenderer = new SideBySideRenderer(hoganUtils, {});
       const fileHtml = sideBySideRenderer.generateEmptyDiff();
       expect(fileHtml).toMatchInlineSnapshot(`
-        {
+        Object {
           "left": "<tr>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line">
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\">
                     File without changes
                 </div>
             </td>
@@ -78,76 +78,76 @@ describe('SideBySideRenderer', () => {
       const fileHtml = sideBySideRenderer.generateFileHtml(file);
 
       expect(fileHtml).toMatchInlineSnapshot(`
-        {
+        Object {
           "left": "<tr>
-            <td class="d2h-code-side-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line">@@ -19,7 +19,7 @@</div>
+            <td class=\\"d2h-code-side-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\">@@ -19,7 +19,7 @@</div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-cntx">
+            <td class=\\"d2h-code-side-linenumber d2h-cntx\\">
               19
             </td>
-            <td class="d2h-cntx">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">&nbsp;</span>
-                    <span class="d2h-code-line-ctn">context</span>
+            <td class=\\"d2h-cntx\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
+                    <span class=\\"d2h-code-line-ctn\\">context</span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-del d2h-change">
+            <td class=\\"d2h-code-side-linenumber d2h-del d2h-change\\">
               20
             </td>
-            <td class="d2h-del d2h-change">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn"><del>removed</del></span>
+            <td class=\\"d2h-del d2h-change\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">-</span>
+                    <span class=\\"d2h-code-line-ctn\\"><del>removed</del></span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">
+            <td class=\\"d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\">
               
             </td>
-            <td class="d2h-cntx d2h-emptyplaceholder">
-                <div class="d2h-code-side-line d2h-code-side-emptyplaceholder">
-                    <span class="d2h-code-line-prefix">&nbsp;</span>
-                    <span class="d2h-code-line-ctn"><br></span>
+            <td class=\\"d2h-cntx d2h-emptyplaceholder\\">
+                <div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder\\">
+                    <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
+                    <span class=\\"d2h-code-line-ctn\\"><br></span>
                 </div>
             </td>
         </tr>",
           "right": "<tr>
-            <td class="d2h-code-side-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line">&nbsp;</div>
+            <td class=\\"d2h-code-side-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\"></div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-cntx">
+            <td class=\\"d2h-code-side-linenumber d2h-cntx\\">
               19
             </td>
-            <td class="d2h-cntx">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">&nbsp;</span>
-                    <span class="d2h-code-line-ctn">context</span>
+            <td class=\\"d2h-cntx\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
+                    <span class=\\"d2h-code-line-ctn\\">context</span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-ins d2h-change">
+            <td class=\\"d2h-code-side-linenumber d2h-ins d2h-change\\">
               20
             </td>
-            <td class="d2h-ins d2h-change">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn"><ins>added</ins></span>
+            <td class=\\"d2h-ins d2h-change\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\"><ins>added</ins></span>
                 </div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-ins">
+            <td class=\\"d2h-code-side-linenumber d2h-ins\\">
               21
             </td>
-            <td class="d2h-ins">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">another added</span>
+            <td class=\\"d2h-ins\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\">another added</span>
                 </div>
             </td>
         </tr>",
@@ -168,26 +168,26 @@ describe('SideBySideRenderer', () => {
       });
 
       expect(fileHtml).toMatchInlineSnapshot(`
-        {
+        Object {
           "left": "<tr>
-            <td class="d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">
+            <td class=\\"d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\">
               
             </td>
-            <td class="d2h-cntx d2h-emptyplaceholder">
-                <div class="d2h-code-side-line d2h-code-side-emptyplaceholder">
-                    <span class="d2h-code-line-prefix">&nbsp;</span>
-                    <span class="d2h-code-line-ctn"><br></span>
+            <td class=\\"d2h-cntx d2h-emptyplaceholder\\">
+                <div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder\\">
+                    <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
+                    <span class=\\"d2h-code-line-ctn\\"><br></span>
                 </div>
             </td>
         </tr>",
           "right": "<tr>
-            <td class="d2h-code-side-linenumber d2h-ins">
+            <td class=\\"d2h-code-side-linenumber d2h-ins\\">
               30
             </td>
-            <td class="d2h-ins">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">test</span>
+            <td class=\\"d2h-ins\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\">test</span>
                 </div>
             </td>
         </tr>",
@@ -208,26 +208,26 @@ describe('SideBySideRenderer', () => {
       );
 
       expect(fileHtml).toMatchInlineSnapshot(`
-        {
+        Object {
           "left": "<tr>
-            <td class="d2h-code-side-linenumber d2h-del">
+            <td class=\\"d2h-code-side-linenumber d2h-del\\">
               30
             </td>
-            <td class="d2h-del">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn">test</span>
+            <td class=\\"d2h-del\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">-</span>
+                    <span class=\\"d2h-code-line-ctn\\">test</span>
                 </div>
             </td>
         </tr>",
           "right": "<tr>
-            <td class="d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder">
+            <td class=\\"d2h-code-side-linenumber d2h-code-side-emptyplaceholder d2h-cntx d2h-emptyplaceholder\\">
               
             </td>
-            <td class="d2h-cntx d2h-emptyplaceholder">
-                <div class="d2h-code-side-line d2h-code-side-emptyplaceholder">
-                    <span class="d2h-code-line-prefix">&nbsp;</span>
-                    <span class="d2h-code-line-ctn"><br></span>
+            <td class=\\"d2h-cntx d2h-emptyplaceholder\\">
+                <div class=\\"d2h-code-side-line d2h-code-side-emptyplaceholder\\">
+                    <span class=\\"d2h-code-line-prefix\\">&nbsp;</span>
+                    <span class=\\"d2h-code-line-ctn\\"><br></span>
                 </div>
             </td>
         </tr>",
@@ -278,37 +278,37 @@ describe('SideBySideRenderer', () => {
       const sideBySideRenderer = new SideBySideRenderer(hoganUtils, { matching: LineMatchingType.LINES });
       const html = sideBySideRenderer.render(exampleJson);
       expect(html).toMatchInlineSnapshot(`
-        "<div class="d2h-wrapper d2h-light-color-scheme">
-            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="txt">
-            <div class="d2h-file-header">
-              <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">sample</span>
-            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div class=\\"d2h-wrapper\\">
+            <div id=\\"d2h-675094\\" class=\\"d2h-file-wrapper\\" data-lang=\\"txt\\">
+            <div class=\\"d2h-file-header\\">
+              <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">sample</span>
+            <span class=\\"d2h-tag d2h-changed d2h-changed-tag\\">CHANGED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-files-diff">
-                <div class="d2h-file-side-diff">
-                    <div class="d2h-code-wrapper">
-                        <table class="d2h-diff-table">
-                            <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-files-diff\\">
+                <div class=\\"d2h-file-side-diff\\">
+                    <div class=\\"d2h-code-wrapper\\">
+                        <table class=\\"d2h-diff-table\\">
+                            <tbody class=\\"d2h-diff-tbody\\">
                             <tr>
-            <td class="d2h-code-side-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line">@@ -1 +1 @@</div>
+            <td class=\\"d2h-code-side-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\">@@ -1 +1 @@</div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-del d2h-change">
+            <td class=\\"d2h-code-side-linenumber d2h-del d2h-change\\">
               1
             </td>
-            <td class="d2h-del d2h-change">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn"><del>test</del></span>
+            <td class=\\"d2h-del d2h-change\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">-</span>
+                    <span class=\\"d2h-code-line-ctn\\"><del>test</del></span>
                 </div>
             </td>
         </tr>
@@ -316,23 +316,23 @@ describe('SideBySideRenderer', () => {
                         </table>
                     </div>
                 </div>
-                <div class="d2h-file-side-diff">
-                    <div class="d2h-code-wrapper">
-                        <table class="d2h-diff-table">
-                            <tbody class="d2h-diff-tbody">
+                <div class=\\"d2h-file-side-diff\\">
+                    <div class=\\"d2h-code-wrapper\\">
+                        <table class=\\"d2h-diff-table\\">
+                            <tbody class=\\"d2h-diff-tbody\\">
                             <tr>
-            <td class="d2h-code-side-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line">&nbsp;</div>
+            <td class=\\"d2h-code-side-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\"></div>
             </td>
         </tr><tr>
-            <td class="d2h-code-side-linenumber d2h-ins d2h-change">
+            <td class=\\"d2h-code-side-linenumber d2h-ins d2h-change\\">
               1
             </td>
-            <td class="d2h-ins d2h-change">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn"><ins>test1r</ins></span>
+            <td class=\\"d2h-ins d2h-change\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\"><ins>test1r</ins></span>
                 </div>
             </td>
         </tr>
@@ -363,27 +363,27 @@ describe('SideBySideRenderer', () => {
       const sideBySideRenderer = new SideBySideRenderer(hoganUtils, {});
       const html = sideBySideRenderer.render(exampleJson);
       expect(html).toMatchInlineSnapshot(`
-        "<div class="d2h-wrapper d2h-light-color-scheme">
-            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-              <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">sample</span>
-            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div class=\\"d2h-wrapper\\">
+            <div id=\\"d2h-675094\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+              <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">sample</span>
+            <span class=\\"d2h-tag d2h-changed d2h-changed-tag\\">CHANGED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-files-diff">
-                <div class="d2h-file-side-diff">
-                    <div class="d2h-code-wrapper">
-                        <table class="d2h-diff-table">
-                            <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-files-diff\\">
+                <div class=\\"d2h-file-side-diff\\">
+                    <div class=\\"d2h-code-wrapper\\">
+                        <table class=\\"d2h-diff-table\\">
+                            <tbody class=\\"d2h-diff-tbody\\">
                             <tr>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line">
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\">
                     File without changes
                 </div>
             </td>
@@ -392,10 +392,10 @@ describe('SideBySideRenderer', () => {
                         </table>
                     </div>
                 </div>
-                <div class="d2h-file-side-diff">
-                    <div class="d2h-code-wrapper">
-                        <table class="d2h-diff-table">
-                            <tbody class="d2h-diff-tbody">
+                <div class=\\"d2h-file-side-diff\\">
+                    <div class=\\"d2h-code-wrapper\\">
+                        <table class=\\"d2h-diff-table\\">
+                            <tbody class=\\"d2h-diff-tbody\\">
                             
                             </tbody>
                         </table>
@@ -434,42 +434,42 @@ describe('SideBySideRenderer', () => {
       const sideBySideRenderer = new SideBySideRenderer(hoganUtils);
       const html = sideBySideRenderer.render(exampleJson);
       expect(html).toMatchInlineSnapshot(`
-        "<div class="d2h-wrapper d2h-light-color-scheme">
-            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="js">
-            <div class="d2h-file-header">
-              <span class="d2h-file-name-wrapper">
-            <svg aria-hidden="true" class="d2h-icon" height="16" version="1.1" viewBox="0 0 12 16" width="12">
-                <path d="M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z"></path>
-            </svg>    <span class="d2h-file-name">sample</span>
-            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-        <label class="d2h-file-collapse">
-            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+        "<div class=\\"d2h-wrapper\\">
+            <div id=\\"d2h-675094\\" class=\\"d2h-file-wrapper\\" data-lang=\\"js\\">
+            <div class=\\"d2h-file-header\\">
+              <span class=\\"d2h-file-name-wrapper\\">
+            <svg aria-hidden=\\"true\\" class=\\"d2h-icon\\" height=\\"16\\" version=\\"1.1\\" viewBox=\\"0 0 12 16\\" width=\\"12\\">
+                <path d=\\"M6 5H2v-1h4v1zM2 8h7v-1H2v1z m0 2h7v-1H2v1z m0 2h7v-1H2v1z m10-7.5v9.5c0 0.55-0.45 1-1 1H1c-0.55 0-1-0.45-1-1V2c0-0.55 0.45-1 1-1h7.5l3.5 3.5z m-1 0.5L8 2H1v12h10V5z\\"></path>
+            </svg>    <span class=\\"d2h-file-name\\">sample</span>
+            <span class=\\"d2h-tag d2h-changed d2h-changed-tag\\">CHANGED</span></span>
+        <label class=\\"d2h-file-collapse\\">
+            <input class=\\"d2h-file-collapse-input\\" type=\\"checkbox\\" name=\\"viewed\\" value=\\"viewed\\">
             Viewed
         </label>
             </div>
-            <div class="d2h-files-diff">
-                <div class="d2h-file-side-diff">
-                    <div class="d2h-code-wrapper">
-                        <table class="d2h-diff-table">
-                            <tbody class="d2h-diff-tbody">
+            <div class=\\"d2h-files-diff\\">
+                <div class=\\"d2h-file-side-diff\\">
+                    <div class=\\"d2h-code-wrapper\\">
+                        <table class=\\"d2h-diff-table\\">
+                            <tbody class=\\"d2h-diff-tbody\\">
                             <tr>
-            <td class="d2h-code-side-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line"><a href="http://example.com">Custom link to render</a></div>
+            <td class=\\"d2h-code-side-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\"><a href=\\"http://example.com\\">Custom link to render</a></div>
             </td>
         </tr>
                             </tbody>
                         </table>
                     </div>
                 </div>
-                <div class="d2h-file-side-diff">
-                    <div class="d2h-code-wrapper">
-                        <table class="d2h-diff-table">
-                            <tbody class="d2h-diff-tbody">
+                <div class=\\"d2h-file-side-diff\\">
+                    <div class=\\"d2h-code-wrapper\\">
+                        <table class=\\"d2h-diff-table\\">
+                            <tbody class=\\"d2h-diff-tbody\\">
                             <tr>
-            <td class="d2h-code-side-linenumber d2h-info"></td>
-            <td class="d2h-info">
-                <div class="d2h-code-side-line">&nbsp;</div>
+            <td class=\\"d2h-code-side-linenumber d2h-info\\"></td>
+            <td class=\\"d2h-info\\">
+                <div class=\\"d2h-code-side-line\\"></div>
             </td>
         </tr>
                             </tbody>
@@ -508,26 +508,26 @@ describe('SideBySideRenderer', () => {
       const html = sideBySideRenderer.processChangedLines(false, oldLines, newLines);
 
       expect(html).toMatchInlineSnapshot(`
-        {
+        Object {
           "left": "<tr>
-            <td class="d2h-code-side-linenumber d2h-del d2h-change">
+            <td class=\\"d2h-code-side-linenumber d2h-del d2h-change\\">
               1
             </td>
-            <td class="d2h-del d2h-change">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn"><del>test</del></span>
+            <td class=\\"d2h-del d2h-change\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">-</span>
+                    <span class=\\"d2h-code-line-ctn\\"><del>test</del></span>
                 </div>
             </td>
         </tr>",
           "right": "<tr>
-            <td class="d2h-code-side-linenumber d2h-ins d2h-change">
+            <td class=\\"d2h-code-side-linenumber d2h-ins d2h-change\\">
               1
             </td>
-            <td class="d2h-ins d2h-change">
-                <div class="d2h-code-side-line">
-                    <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn"><ins>test1r</ins></span>
+            <td class=\\"d2h-ins d2h-change\\">
+                <div class=\\"d2h-code-side-line\\">
+                    <span class=\\"d2h-code-line-prefix\\">+</span>
+                    <span class=\\"d2h-code-line-ctn\\"><ins>test1r</ins></span>
                 </div>
             </td>
         </tr>",

src/diff-parser.ts

@@ -272,7 +272,7 @@ export function parse(diffInput: string, config: DiffParserConfig = {}): DiffFil
     const nxtLine = diffLines[lineIndex + 1];
     const afterNxtLine = diffLines[lineIndex + 2];
 
-    if (line.startsWith('diff --git') || line.startsWith('diff --combined')) {
+    if (line.startsWith('diff')) {
       startFile();
 
       // diff --git a/blocked_delta_results.png b/blocked_delta_results.png
@@ -290,22 +290,6 @@ export function parse(diffInput: string, config: DiffParserConfig = {}): DiffFil
       return;
     }
 
-    if (line.startsWith('Binary files') && !currentFile?.isGitDiff) {
-      startFile();
-      const unixDiffBinaryStart = /^Binary files "?([a-ciow]\/.+)"? and "?([a-ciow]\/.+)"? differ/;
-      if ((values = unixDiffBinaryStart.exec(line))) {
-        possibleOldName = getFilename(values[1], undefined, config.dstPrefix);
-        possibleNewName = getFilename(values[2], undefined, config.srcPrefix);
-      }
-
-      if (currentFile === null) {
-        throw new Error('Where is my file !!!');
-      }
-
-      currentFile.isBinary = true;
-      return;
-    }
-
     if (
       !currentFile || // If we do not have a file yet, we should crete one
       (!currentFile.isGitDiff &&
@@ -458,16 +442,18 @@ export function parse(diffInput: string, config: DiffParserConfig = {}): DiffFil
     } else if ((values = index.exec(line))) {
       currentFile.checksumBefore = values[1];
       currentFile.checksumAfter = values[2];
-      if (values[3]) currentFile.mode = values[3];
+      values[3] && (currentFile.mode = values[3]);
     } else if ((values = combinedIndex.exec(line))) {
       currentFile.checksumBefore = [values[2], values[3]];
       currentFile.checksumAfter = values[1];
     } else if ((values = combinedMode.exec(line))) {
       currentFile.oldMode = [values[2], values[3]];
       currentFile.newMode = values[1];
+      // eslint-disable-next-line sonarjs/no-duplicated-branches
     } else if ((values = combinedNewFile.exec(line))) {
       currentFile.newFileMode = values[1];
       currentFile.isNew = true;
+      // eslint-disable-next-line sonarjs/no-duplicated-branches
     } else if ((values = combinedDeletedFile.exec(line))) {
       currentFile.deletedFileMode = values[1];
       currentFile.isDeleted = true;

src/diff2html.ts

@@ -1,5 +1,5 @@
 import * as DiffParser from './diff-parser';
-import { FileListRenderer } from './file-list-renderer';
+import * as fileListPrinter from './file-list-renderer';
 import LineByLineRenderer, { LineByLineRendererConfig, defaultLineByLineRendererConfig } from './line-by-line-renderer';
 import SideBySideRenderer, { SideBySideRendererConfig, defaultSideBySideRendererConfig } from './side-by-side-renderer';
 import { DiffFile, OutputFormatType } from './types';
@@ -32,10 +32,7 @@ export function html(diffInput: string | DiffFile[], configuration: Diff2HtmlCon
 
   const hoganUtils = new HoganJsUtils(config);
 
-  const { colorScheme } = config;
-  const fileListRendererConfig = { colorScheme };
-
-  const fileList = config.drawFileList ? new FileListRenderer(hoganUtils, fileListRendererConfig).render(diffJson) : '';
+  const fileList = config.drawFileList ? fileListPrinter.render(diffJson, hoganUtils) : '';
 
   const diffOutput =
     config.outputFormat === 'side-by-side'

src/file-list-renderer.ts

@@ -1,52 +1,33 @@
 import * as renderUtils from './render-utils';
 import HoganJsUtils from './hoganjs-utils';
-import { ColorSchemeType, DiffFile } from './types';
+import { DiffFile } from './types';
 
 const baseTemplatesPath = 'file-summary';
 const iconsBaseTemplatesPath = 'icon';
 
-export interface FileListRendererConfig {
-  colorScheme?: ColorSchemeType;
-}
-
-export const defaultFileListRendererConfig = {
-  colorScheme: renderUtils.defaultRenderConfig.colorScheme,
-};
-
-export class FileListRenderer {
-  private readonly hoganUtils: HoganJsUtils;
-  private readonly config: typeof defaultFileListRendererConfig;
-
-  constructor(hoganUtils: HoganJsUtils, config: FileListRendererConfig = {}) {
-    this.hoganUtils = hoganUtils;
-    this.config = { ...defaultFileListRendererConfig, ...config };
-  }
-
-  render(diffFiles: DiffFile[]): string {
-    const files = diffFiles
-      .map(file =>
-        this.hoganUtils.render(
-          baseTemplatesPath,
-          'line',
-          {
-            fileHtmlId: renderUtils.getHtmlId(file),
-            oldName: file.oldName,
-            newName: file.newName,
-            fileName: renderUtils.filenameDiff(file),
-            deletedLines: '-' + file.deletedLines,
-            addedLines: '+' + file.addedLines,
-          },
-          {
-            fileIcon: this.hoganUtils.template(iconsBaseTemplatesPath, renderUtils.getFileIcon(file)),
-          },
-        ),
-      )
-      .join('\n');
-
-    return this.hoganUtils.render(baseTemplatesPath, 'wrapper', {
-      colorScheme: renderUtils.colorSchemeToCss(this.config.colorScheme),
-      filesNumber: diffFiles.length,
-      files: files,
-    });
-  }
+export function render(diffFiles: DiffFile[], hoganUtils: HoganJsUtils): string {
+  const files = diffFiles
+    .map(file =>
+      hoganUtils.render(
+        baseTemplatesPath,
+        'line',
+        {
+          fileHtmlId: renderUtils.getHtmlId(file),
+          oldName: file.oldName,
+          newName: file.newName,
+          fileName: renderUtils.filenameDiff(file),
+          deletedLines: '-' + file.deletedLines,
+          addedLines: '+' + file.addedLines,
+        },
+        {
+          fileIcon: hoganUtils.template(iconsBaseTemplatesPath, renderUtils.getFileIcon(file)),
+        },
+      ),
+    )
+    .join('\n');
+
+  return hoganUtils.render(baseTemplatesPath, 'wrapper', {
+    filesNumber: diffFiles.length,
+    files: files,
+  });
 }

src/hoganjs-utils.ts

@@ -1,4 +1,4 @@
-import * as Hogan from 'hogan.js';
+import mustache, { CompiledTemplate, Partials } from 'wontache';
 
 import { defaultTemplates } from './diff2html-templates';
 
@@ -7,7 +7,7 @@ export interface RawTemplates {
 }
 
 export interface CompiledTemplates {
-  [name: string]: Hogan.Template;
+  [name: string]: CompiledTemplate;
 }
 
 export interface HoganJsUtilsConfig {
@@ -21,7 +21,7 @@ export default class HoganJsUtils {
   constructor({ compiledTemplates = {}, rawTemplates = {} }: HoganJsUtilsConfig) {
     const compiledRawTemplates = Object.entries(rawTemplates).reduce<CompiledTemplates>(
       (previousTemplates, [name, templateString]) => {
-        const compiledTemplate: Hogan.Template = Hogan.compile(templateString, { asString: false });
+        const compiledTemplate: CompiledTemplate = mustache(templateString);
         return { ...previousTemplates, [name]: compiledTemplate };
       },
       {},
@@ -30,21 +30,21 @@ export default class HoganJsUtils {
     this.preCompiledTemplates = { ...defaultTemplates, ...compiledTemplates, ...compiledRawTemplates };
   }
 
-  static compile(templateString: string): Hogan.Template {
-    return Hogan.compile(templateString, { asString: false });
+  static compile(templateString: string): CompiledTemplate {
+    return mustache(templateString);
   }
 
-  render(namespace: string, view: string, params: Hogan.Context, partials?: Hogan.Partials, indent?: string): string {
+  render(namespace: string, view: string, params: object, partials?: Partials): string {
     const templateKey = this.templateKey(namespace, view);
     try {
       const template = this.preCompiledTemplates[templateKey];
-      return template.render(params, partials, indent);
-    } catch (_e) {
+      return template(params, { partials });
+    } catch (e) {
       throw new Error(`Could not find template to render '${templateKey}'`);
     }
   }
 
-  template(namespace: string, view: string): Hogan.Template {
+  template(namespace: string, view: string): CompiledTemplate {
     return this.preCompiledTemplates[this.templateKey(namespace, view)];
   }
 

src/line-by-line-renderer.ts

@@ -52,10 +52,7 @@ export default class LineByLineRenderer {
       })
       .join('\n');
 
-    return this.hoganUtils.render(genericTemplatesPath, 'wrapper', {
-      colorScheme: renderUtils.colorSchemeToCss(this.config.colorScheme),
-      content: diffsHtml,
-    });
+    return this.hoganUtils.render(genericTemplatesPath, 'wrapper', { content: diffsHtml });
   }
 
   makeFileDiffHtml(file: DiffFile, diffs: string): string {
@@ -66,17 +63,19 @@ export default class LineByLineRenderer {
     const fileIconTemplate = this.hoganUtils.template(iconsBaseTemplatesPath, 'file');
     const fileTagTemplate = this.hoganUtils.template(tagsBaseTemplatesPath, renderUtils.getFileIcon(file));
 
-    return fileDiffTemplate.render({
+    return fileDiffTemplate({
       file: file,
       fileHtmlId: renderUtils.getHtmlId(file),
       diffs: diffs,
-      filePath: filePathTemplate.render(
+      filePath: filePathTemplate(
         {
           fileDiffName: renderUtils.filenameDiff(file),
         },
         {
-          fileIcon: fileIconTemplate,
-          fileTag: fileTagTemplate,
+          partials: {
+            fileIcon: fileIconTemplate,
+            fileTag: fileTagTemplate,
+          },
         },
       ),
     });
@@ -106,14 +105,14 @@ export default class LineByLineRenderer {
         this.applyLineGroupping(block).forEach(([contextLines, oldLines, newLines]) => {
           if (oldLines.length && newLines.length && !contextLines.length) {
             this.applyRematchMatching(oldLines, newLines, matcher).map(([oldLines, newLines]) => {
-              const { left, right } = this.processChangedLines(file, file.isCombined, oldLines, newLines);
+              const { left, right } = this.processChangedLines(file.isCombined, oldLines, newLines);
               lines += left;
               lines += right;
             });
           } else if (contextLines.length) {
             contextLines.forEach(line => {
               const { prefix, content } = renderUtils.deconstructLine(line.content, file.isCombined);
-              lines += this.generateSingleLineHtml(file, {
+              lines += this.generateSingleLineHtml({
                 type: renderUtils.CSSLineClass.CONTEXT,
                 prefix: prefix,
                 content: content,
@@ -122,7 +121,7 @@ export default class LineByLineRenderer {
               });
             });
           } else if (oldLines.length || newLines.length) {
-            const { left, right } = this.processChangedLines(file, file.isCombined, oldLines, newLines);
+            const { left, right } = this.processChangedLines(file.isCombined, oldLines, newLines);
             lines += left;
             lines += right;
           } else {
@@ -191,7 +190,7 @@ export default class LineByLineRenderer {
     return doMatching ? matcher(oldLines, newLines) : [[oldLines, newLines]];
   }
 
-  processChangedLines(file: DiffFile, isCombined: boolean, oldLines: DiffLine[], newLines: DiffLine[]): FileHtml {
+  processChangedLines(isCombined: boolean, oldLines: DiffLine[], newLines: DiffLine[]): FileHtml {
     const fileHtml = {
       right: '',
       left: '',
@@ -243,7 +242,7 @@ export default class LineByLineRenderer {
             }
           : undefined;
 
-      const { left, right } = this.generateLineHtml(file, preparedOldLine, preparedNewLine);
+      const { left, right } = this.generateLineHtml(preparedOldLine, preparedNewLine);
       fileHtml.left += left;
       fileHtml.right += right;
     }
@@ -251,14 +250,14 @@ export default class LineByLineRenderer {
     return fileHtml;
   }
 
-  generateLineHtml(file: DiffFile, oldLine?: DiffPreparedLine, newLine?: DiffPreparedLine): FileHtml {
+  generateLineHtml(oldLine?: DiffPreparedLine, newLine?: DiffPreparedLine): FileHtml {
     return {
-      left: this.generateSingleLineHtml(file, oldLine),
-      right: this.generateSingleLineHtml(file, newLine),
+      left: this.generateSingleLineHtml(oldLine),
+      right: this.generateSingleLineHtml(newLine),
     };
   }
 
-  generateSingleLineHtml(file: DiffFile, line?: DiffPreparedLine): string {
+  generateSingleLineHtml(line?: DiffPreparedLine): string {
     if (line === undefined) return '';
 
     const lineNumberHtml = this.hoganUtils.render(baseTemplatesPath, 'numbers', {
@@ -273,8 +272,6 @@ export default class LineByLineRenderer {
       prefix: line.prefix === ' ' ? ' ' : line.prefix,
       content: line.content,
       lineNumber: lineNumberHtml,
-      line,
-      file,
     });
   }
 }

src/render-utils.ts

@@ -2,15 +2,7 @@ import * as jsDiff from 'diff';
 
 import { unifyPath, hashCode } from './utils';
 import * as rematch from './rematch';
-import {
-  ColorSchemeType,
-  DiffFile,
-  DiffFileName,
-  DiffLineParts,
-  DiffStyleType,
-  LineMatchingType,
-  LineType,
-} from './types';
+import { LineMatchingType, DiffStyleType, LineType, DiffLineParts, DiffFile, DiffFileName } from './types';
 
 export type CSSLineClass =
   | 'd2h-ins'
@@ -45,7 +37,6 @@ export interface RenderConfig {
   matchWordsThreshold?: number;
   maxLineLengthHighlight?: number;
   diffStyle?: DiffStyleType;
-  colorScheme?: ColorSchemeType;
 }
 
 export const defaultRenderConfig = {
@@ -53,7 +44,6 @@ export const defaultRenderConfig = {
   matchWordsThreshold: 0.25,
   maxLineLengthHighlight: 10000,
   diffStyle: DiffStyleType.WORD,
-  colorScheme: ColorSchemeType.LIGHT,
 };
 
 const separator = '/';
@@ -86,18 +76,6 @@ export function toCSSClass(lineType: LineType): CSSLineClass {
   }
 }
 
-export function colorSchemeToCss(colorScheme: ColorSchemeType): string {
-  switch (colorScheme) {
-    case ColorSchemeType.DARK:
-      return 'd2h-dark-color-scheme';
-    case ColorSchemeType.AUTO:
-      return 'd2h-auto-color-scheme';
-    case ColorSchemeType.LIGHT:
-    default:
-      return 'd2h-light-color-scheme';
-  }
-}
-
 /**
  * Prefix length of the hunk lines in the diff
  */

src/side-by-side-renderer.ts

@@ -52,10 +52,7 @@ export default class SideBySideRenderer {
       })
       .join('\n');
 
-    return this.hoganUtils.render(genericTemplatesPath, 'wrapper', {
-      colorScheme: renderUtils.colorSchemeToCss(this.config.colorScheme),
-      content: diffsHtml,
-    });
+    return this.hoganUtils.render(genericTemplatesPath, 'wrapper', { content: diffsHtml });
   }
 
   makeFileDiffHtml(file: DiffFile, diffs: FileHtml): string {
@@ -66,17 +63,19 @@ export default class SideBySideRenderer {
     const fileIconTemplate = this.hoganUtils.template(iconsBaseTemplatesPath, 'file');
     const fileTagTemplate = this.hoganUtils.template(tagsBaseTemplatesPath, renderUtils.getFileIcon(file));
 
-    return fileDiffTemplate.render({
+    return fileDiffTemplate({
       file: file,
       fileHtmlId: renderUtils.getHtmlId(file),
       diffs: diffs,
-      filePath: filePathTemplate.render(
+      filePath: filePathTemplate(
         {
           fileDiffName: renderUtils.filenameDiff(file),
         },
         {
-          fileIcon: fileIconTemplate,
-          fileTag: fileTagTemplate,
+          partials: {
+            fileIcon: fileIconTemplate,
+            fileTag: fileTagTemplate,
+          },
         },
       ),
     });

src/templates/file-summary-wrapper.mustache

@@ -1,4 +1,4 @@
-<div class="d2h-file-list-wrapper {{colorScheme}}">
+<div class="d2h-file-list-wrapper">
     <div class="d2h-file-list-header">
         <span class="d2h-file-list-title">Files changed ({{filesNumber}})</span>
         <a class="d2h-file-switch d2h-hide">hide</a>

src/templates/generic-block-header.mustache

@@ -1,6 +1,6 @@
 <tr>
     <td class="{{lineClass}} {{CSSLineClass.INFO}}"></td>
     <td class="{{CSSLineClass.INFO}}">
-        <div class="{{contentClass}}">{{#blockHeader}}{{{blockHeader}}}{{/blockHeader}}{{^blockHeader}}&nbsp;{{/blockHeader}}</div>
+        <div class="{{contentClass}}">{{{blockHeader}}}</div>
     </td>
 </tr>

src/templates/generic-wrapper.mustache

@@ -1,3 +1,3 @@
-<div class="d2h-wrapper {{colorScheme}}">
+<div class="d2h-wrapper">
     {{{content}}}
 </div>

src/types.ts

@@ -91,9 +91,3 @@ export const DiffStyleType: { [_: string]: DiffStyleType } = {
   WORD: 'word',
   CHAR: 'char',
 };
-
-export enum ColorSchemeType {
-  AUTO = 'auto',
-  DARK = 'dark',
-  LIGHT = 'light',
-}

src/ui/css/diff2html.css

@@ -5,82 +5,6 @@
  *
  */
 
-:root,
-:host {
-  --d2h-bg-color: #fff;
-  --d2h-border-color: #ddd;
-
-  --d2h-dim-color: rgba(0, 0, 0, 0.3);
-
-  --d2h-line-border-color: #eeeeee;
-
-  --d2h-file-header-bg-color: #f7f7f7;
-  --d2h-file-header-border-color: #d8d8d8;
-
-  --d2h-empty-placeholder-bg-color: #f1f1f1;
-  --d2h-empty-placeholder-border-color: #e1e1e1;
-
-  --d2h-selected-color: #c8e1ff;
-
-  --d2h-ins-bg-color: #dfd;
-  --d2h-ins-border-color: #b4e2b4;
-  --d2h-ins-highlight-bg-color: #97f295;
-  --d2h-ins-label-color: #399839;
-
-  --d2h-del-bg-color: #fee8e9;
-  --d2h-del-border-color: #e9aeae;
-  --d2h-del-highlight-bg-color: #ffb6ba;
-  --d2h-del-label-color: #c33;
-
-  --d2h-change-del-color: #fdf2d0;
-  --d2h-change-ins-color: #ded;
-
-  --d2h-info-bg-color: #f8fafd;
-  --d2h-info-border-color: #d5e4f2;
-
-  --d2h-change-label-color: #d0b44c;
-  --d2h-moved-label-color: #3572b0;
-
-  /**
-   * Dark Color Scheme
-   */
-
-  --d2h-dark-color: rgb(230, 237, 243);
-  --d2h-dark-bg-color: rgb(13, 17, 23);
-  --d2h-dark-border-color: rgb(48, 54, 61);
-
-  --d2h-dark-dim-color: rgb(110, 118, 129);
-
-  --d2h-dark-line-border-color: rgb(33, 38, 45);
-
-  --d2h-dark-file-header-bg-color: rgb(22, 27, 34);
-  --d2h-dark-file-header-border-color: rgb(48, 54, 61);
-
-  --d2h-dark-empty-placeholder-bg-color: rgba(110, 118, 129, 0.1);
-  --d2h-dark-empty-placeholder-border-color: rgb(48, 54, 61);
-
-  --d2h-dark-selected-color: rgba(56, 139, 253, 0.1);
-
-  --d2h-dark-ins-bg-color: rgba(46, 160, 67, 0.15);
-  --d2h-dark-ins-border-color: rgba(46, 160, 67, 0.4);
-  --d2h-dark-ins-highlight-bg-color: rgba(46, 160, 67, 0.4);
-  --d2h-dark-ins-label-color: rgb(63, 185, 80);
-
-  --d2h-dark-del-bg-color: rgba(248, 81, 73, 0.1);
-  --d2h-dark-del-border-color: rgba(248, 81, 73, 0.4);
-  --d2h-dark-del-highlight-bg-color: rgba(248, 81, 73, 0.4);
-  --d2h-dark-del-label-color: rgb(248, 81, 73);
-
-  --d2h-dark-change-del-color: rgba(210, 153, 34, 0.2);
-  --d2h-dark-change-ins-color: rgba(46, 160, 67, 0.25);
-
-  --d2h-dark-info-bg-color: rgba(56, 139, 253, 0.1);
-  --d2h-dark-info-border-color: rgba(56, 139, 253, 0.4);
-
-  --d2h-dark-change-label-color: rgb(210, 153, 34);
-  --d2h-dark-moved-label-color: #3572b0;
-}
-
 .d2h-wrapper {
   text-align: left;
 }
@@ -89,17 +13,11 @@
   display: flex;
   height: 35px;
   padding: 5px 10px;
-  border-bottom: 1px solid var(--d2h-file-header-border-color);
-  background-color: var(--d2h-file-header-bg-color);
+  border-bottom: 1px solid #d8d8d8;
+  background-color: #f7f7f7;
   font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
-.d2h-file-header.d2h-sticky-header {
-  position: sticky;
-  top: 0;
-  z-index: 1;
-}
-
 .d2h-file-stats {
   display: -webkit-box;
   display: -ms-flexbox;
@@ -110,18 +28,18 @@
 
 .d2h-lines-added {
   text-align: right;
-  border: 1px solid var(--d2h-ins-border-color);
+  border: 1px solid #b4e2b4;
   border-radius: 5px 0 0 5px;
-  color: var(--d2h-ins-label-color);
+  color: #399839;
   padding: 2px;
   vertical-align: middle;
 }
 
 .d2h-lines-deleted {
   text-align: left;
-  border: 1px solid var(--d2h-del-border-color);
+  border: 1px solid #e9aeae;
   border-radius: 0 5px 5px 0;
-  color: var(--d2h-del-label-color);
+  color: #c33;
   padding: 2px;
   vertical-align: middle;
   margin-left: 1px;
@@ -145,7 +63,7 @@
 }
 
 .d2h-file-wrapper {
-  border: 1px solid var(--d2h-border-color);
+  border: 1px solid #ddd;
   border-radius: 3px;
   margin-bottom: 1em;
 }
@@ -157,12 +75,12 @@
   font-size: 12px;
   align-items: center;
   border-radius: 3px;
-  border: 1px solid var(--d2h-border-color);
+  border: 1px solid #ddd;
   padding: 4px 8px;
 }
 
 .d2h-file-collapse.d2h-selected {
-  background-color: var(--d2h-selected-color);
+  background-color: #c8e1ff;
 }
 
 .d2h-file-collapse-input {
@@ -195,13 +113,15 @@
   overflow-x: scroll;
   overflow-y: hidden;
   width: 50%;
+  margin-right: -4px;
+  margin-bottom: -8px;
 }
 
 .d2h-code-line {
   display: inline-block;
   white-space: nowrap;
   user-select: none;
-  width: calc(100% - 16em);
+  width: 100%;
   /* Compensate for the absolute positioning of the line numbers */
   padding: 0 8em;
 }
@@ -210,7 +130,7 @@
   display: inline-block;
   white-space: nowrap;
   user-select: none;
-  width: calc(100% - 9em);
+  width: 100%;
   /* Compensate for the absolute positioning of the line numbers */
   padding: 0 4.5em;
 }
@@ -231,8 +151,9 @@
   display: inline-block;
   margin-top: -1px;
   text-decoration: none;
-  background-color: var(--d2h-del-highlight-bg-color);
+  background-color: #ffb6ba;
   border-radius: 0.2em;
+  vertical-align: middle;
 }
 
 .d2h-code-line ins,
@@ -240,9 +161,10 @@
   display: inline-block;
   margin-top: -1px;
   text-decoration: none;
-  background-color: var(--d2h-ins-highlight-bg-color);
+  background-color: #97f295;
   border-radius: 0.2em;
   text-align: left;
+  vertical-align: middle;
 }
 
 .d2h-code-line-prefix {
@@ -277,10 +199,10 @@
   /* Keep the numbers fixed on line contents scroll */
   position: absolute;
   display: inline-block;
-  background-color: var(--d2h-bg-color);
-  color: var(--d2h-dim-color);
+  background-color: #fff;
+  color: rgba(0, 0, 0, 0.3);
   text-align: right;
-  border: solid var(--d2h-line-border-color);
+  border: solid #eeeeee;
   border-width: 0 1px 0 1px;
   cursor: pointer;
 }
@@ -295,10 +217,10 @@
   display: inline-block;
   box-sizing: border-box;
   width: 4em;
-  background-color: var(--d2h-bg-color);
-  color: var(--d2h-dim-color);
+  background-color: #fff;
+  color: rgba(0, 0, 0, 0.3);
   text-align: right;
-  border: solid var(--d2h-line-border-color);
+  border: solid #eeeeee;
   border-width: 0 1px 0 1px;
   cursor: pointer;
   overflow: hidden;
@@ -312,8 +234,8 @@
 
 .d2h-code-side-emptyplaceholder,
 .d2h-emptyplaceholder {
-  background-color: var(--d2h-empty-placeholder-bg-color);
-  border-color: var(--d2h-empty-placeholder-border-color);
+  background-color: #f1f1f1;
+  border-color: #e1e1e1;
 }
 
 .d2h-code-linenumber,
@@ -333,27 +255,27 @@
  */
 
 .d2h-del {
-  background-color: var(--d2h-del-bg-color);
-  border-color: var(--d2h-del-border-color);
+  background-color: #fee8e9;
+  border-color: #e9aeae;
 }
 
 .d2h-ins {
-  background-color: var(--d2h-ins-bg-color);
-  border-color: var(--d2h-ins-border-color);
+  background-color: #dfd;
+  border-color: #b4e2b4;
 }
 
 .d2h-info {
-  background-color: var(--d2h-info-bg-color);
-  color: var(--d2h-dim-color);
-  border-color: var(--d2h-info-border-color);
+  background-color: #f8fafd;
+  color: rgba(0, 0, 0, 0.3);
+  border-color: #d5e4f2;
 }
 
 .d2h-file-diff .d2h-del.d2h-change {
-  background-color: var(--d2h-change-del-color);
+  background-color: #fdf2d0;
 }
 
 .d2h-file-diff .d2h-ins.d2h-change {
-  background-color: var(--d2h-change-ins-color);
+  background-color: #ded;
 }
 
 /*
@@ -366,11 +288,11 @@
 
 .d2h-file-list-wrapper a {
   text-decoration: none;
-  color: var(--d2h-moved-label-color);
+  color: #3572b0;
 }
 
 .d2h-file-list-wrapper a:visited {
-  color: var(--d2h-moved-label-color);
+  color: #3572b0;
 }
 
 .d2h-file-list-header {
@@ -396,7 +318,7 @@
 }
 
 .d2h-file-list > li {
-  border-bottom: var(--d2h-border-color) solid 1px;
+  border-bottom: #ddd solid 1px;
   padding: 5px 10px;
   margin: 0;
 }
@@ -418,19 +340,19 @@
 }
 
 .d2h-deleted {
-  color: var(--d2h-del-label-color);
+  color: #c33;
 }
 
 .d2h-added {
-  color: var(--d2h-ins-label-color);
+  color: #399839;
 }
 
 .d2h-changed {
-  color: var(--d2h-change-label-color);
+  color: #d0b44c;
 }
 
 .d2h-moved {
-  color: var(--d2h-moved-label-color);
+  color: #3572b0;
 }
 
 .d2h-tag {
@@ -440,302 +362,21 @@
   font-size: 10px;
   margin-left: 5px;
   padding: 0 2px;
-  background-color: var(--d2h-bg-color);
+  background-color: #fff;
 }
 
 .d2h-deleted-tag {
-  border: var(--d2h-del-label-color) 1px solid;
+  border: #c33 1px solid;
 }
 
 .d2h-added-tag {
-  border: var(--d2h-ins-label-color) 1px solid;
+  border: #399839 1px solid;
 }
 
 .d2h-changed-tag {
-  border: var(--d2h-change-label-color) 1px solid;
+  border: #d0b44c 1px solid;
 }
 
 .d2h-moved-tag {
-  border: var(--d2h-moved-label-color) 1px solid;
-}
-
-/**
- * Dark Mode Colors
- */
-
-.d2h-dark-color-scheme {
-  color: var(--d2h-dark-color);
-  background-color: var(--d2h-dark-bg-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-header {
-  background-color: var(--d2h-dark-file-header-bg-color);
-  border-bottom: var(--d2h-dark-file-header-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-lines-added {
-  border: 1px solid var(--d2h-dark-ins-border-color);
-  color: var(--d2h-dark-ins-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-lines-deleted {
-  border: 1px solid var(--d2h-dark-del-border-color);
-  color: var(--d2h-dark-del-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-code-line del,
-.d2h-dark-color-scheme .d2h-code-side-line del {
-  background-color: var(--d2h-dark-del-highlight-bg-color);
-}
-
-.d2h-dark-color-scheme .d2h-code-line ins,
-.d2h-dark-color-scheme .d2h-code-side-line ins {
-  background-color: var(--d2h-dark-ins-highlight-bg-color);
-}
-
-.d2h-dark-color-scheme .d2h-diff-tbody {
-  border-color: var(--d2h-dark-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-code-side-linenumber {
-  background-color: var(--d2h-dark-bg-color);
-  color: var(--d2h-dark-dim-color);
-  border-color: var(--d2h-dark-line-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-files-diff .d2h-code-side-emptyplaceholder,
-.d2h-dark-color-scheme .d2h-files-diff .d2h-emptyplaceholder {
-  background-color: var(--d2h-dark-empty-placeholder-bg-color);
-  border-color: var(--d2h-dark-empty-placeholder-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-code-linenumber {
-  background-color: var(--d2h-dark-bg-color);
-  color: var(--d2h-dark-dim-color);
-  border-color: var(--d2h-dark-line-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-del {
-  background-color: var(--d2h-dark-del-bg-color);
-  border-color: var(--d2h-dark-del-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-ins {
-  background-color: var(--d2h-dark-ins-bg-color);
-  border-color: var(--d2h-dark-ins-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-info {
-  background-color: var(--d2h-dark-info-bg-color);
-  color: var(--d2h-dark-dim-color);
-  border-color: var(--d2h-dark-info-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-diff .d2h-del.d2h-change {
-  background-color: var(--d2h-dark-change-del-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-diff .d2h-ins.d2h-change {
-  background-color: var(--d2h-dark-change-ins-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-wrapper {
-  border: 1px solid var(--d2h-dark-border-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-collapse {
-  border: 1px solid var(--d2h-dark-bg-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-collapse.d2h-selected {
-  background-color: var(--d2h-dark-selected-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-list-wrapper a {
-  color: var(--d2h-dark-moved-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-list-wrapper a:visited {
-  color: var(--d2h-dark-moved-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-file-list > li {
-  border-bottom: var(--d2h-dark-bg-color) solid 1px;
-}
-
-.d2h-dark-color-scheme .d2h-deleted {
-  color: var(--d2h-dark-del-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-added {
-  color: var(--d2h-dark-ins-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-changed {
-  color: var(--d2h-dark-change-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-moved {
-  color: var(--d2h-dark-moved-label-color);
-}
-
-.d2h-dark-color-scheme .d2h-tag {
-  background-color: var(--d2h-dark-bg-color);
-}
-
-.d2h-dark-color-scheme .d2h-deleted-tag {
-  border: var(--d2h-dark-del-label-color) 1px solid;
-}
-
-.d2h-dark-color-scheme .d2h-added-tag {
-  border: var(--d2h-dark-ins-label-color) 1px solid;
-}
-
-.d2h-dark-color-scheme .d2h-changed-tag {
-  border: var(--d2h-dark-change-label-color) 1px solid;
-}
-
-.d2h-dark-color-scheme .d2h-moved-tag {
-  border: var(--d2h-dark-moved-label-color) 1px solid;
-}
-
-/**
- * Auto Mode Colors
- */
-@media (prefers-color-scheme: dark) {
-  .d2h-auto-color-scheme {
-    background-color: var(--d2h-dark-bg-color);
-    color: var(--d2h-dark-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-header {
-    background-color: var(--d2h-dark-file-header-bg-color);
-    border-bottom: var(--d2h-dark-file-header-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-lines-added {
-    border: 1px solid var(--d2h-dark-ins-border-color);
-    color: var(--d2h-dark-ins-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-lines-deleted {
-    border: 1px solid var(--d2h-dark-del-border-color);
-    color: var(--d2h-dark-del-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-code-line del,
-  .d2h-auto-color-scheme .d2h-code-side-line del {
-    background-color: var(--d2h-dark-del-highlight-bg-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-code-line ins,
-  .d2h-auto-color-scheme .d2h-code-side-line ins {
-    background-color: var(--d2h-dark-ins-highlight-bg-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-diff-tbody {
-    border-color: var(--d2h-dark-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-code-side-linenumber {
-    background-color: var(--d2h-dark-bg-color);
-    color: var(--d2h-dark-dim-color);
-    border-color: var(--d2h-dark-line-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-files-diff .d2h-code-side-emptyplaceholder,
-  .d2h-auto-color-scheme .d2h-files-diff .d2h-emptyplaceholder {
-    background-color: var(--d2h-dark-empty-placeholder-bg-color);
-    border-color: var(--d2h-dark-empty-placeholder-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-code-linenumber {
-    background-color: var(--d2h-dark-bg-color);
-    color: var(--d2h-dark-dim-color);
-    border-color: var(--d2h-dark-line-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-del {
-    background-color: var(--d2h-dark-del-bg-color);
-    border-color: var(--d2h-dark-del-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-ins {
-    background-color: var(--d2h-dark-ins-bg-color);
-    border-color: var(--d2h-dark-ins-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-info {
-    background-color: var(--d2h-dark-info-bg-color);
-    color: var(--d2h-dark-dim-color);
-    border-color: var(--d2h-dark-info-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-diff .d2h-del.d2h-change {
-    background-color: var(--d2h-dark-change-del-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-diff .d2h-ins.d2h-change {
-    background-color: var(--d2h-dark-change-ins-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-wrapper {
-    border: 1px solid var(--d2h-dark-border-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-collapse {
-    border: 1px solid var(--d2h-dark-bg-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-collapse.d2h-selected {
-    background-color: var(--d2h-dark-selected-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-list-wrapper a {
-    color: var(--d2h-dark-moved-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-list-wrapper a:visited {
-    color: var(--d2h-dark-moved-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-file-list > li {
-    border-bottom: var(--d2h-dark-bg-color) solid 1px;
-  }
-
-  .d2h-dark-color-scheme .d2h-deleted {
-    color: var(--d2h-dark-del-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-added {
-    color: var(--d2h-dark-ins-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-changed {
-    color: var(--d2h-dark-change-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-moved {
-    color: var(--d2h-dark-moved-label-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-tag {
-    background-color: var(--d2h-dark-bg-color);
-  }
-
-  .d2h-auto-color-scheme .d2h-deleted-tag {
-    border: var(--d2h-dark-del-label-color) 1px solid;
-  }
-
-  .d2h-auto-color-scheme .d2h-added-tag {
-    border: var(--d2h-dark-ins-label-color) 1px solid;
-  }
-
-  .d2h-auto-color-scheme .d2h-changed-tag {
-    border: var(--d2h-dark-change-label-color) 1px solid;
-  }
-
-  .d2h-auto-color-scheme .d2h-moved-tag {
-    border: var(--d2h-dark-moved-label-color) 1px solid;
-  }
+  border: #3572b0 1px solid;
 }

src/ui/js/diff2html-ui-base.ts

@@ -9,14 +9,12 @@ export interface Diff2HtmlUIConfig extends Diff2HtmlConfig {
   highlight?: boolean;
   fileListToggle?: boolean;
   fileListStartVisible?: boolean;
-  highlightLanguages?: Map<string, string>;
   /**
    * @deprecated since version 3.1.0
    * Smart selection is now enabled by default with vanilla CSS
    */
   smartSelection?: boolean;
   fileContentToggle?: boolean;
-  stickyFileHeaders?: boolean;
 }
 
 export const defaultDiff2HtmlUIConfig = {
@@ -25,14 +23,12 @@ export const defaultDiff2HtmlUIConfig = {
   highlight: true,
   fileListToggle: true,
   fileListStartVisible: false,
-  highlightLanguages: new Map<string, string>(),
   /**
    * @deprecated since version 3.1.0
    * Smart selection is now enabled by default with vanilla CSS
    */
   smartSelection: true,
   fileContentToggle: true,
-  stickyFileHeaders: true,
 };
 
 export class Diff2HtmlUI {
@@ -56,7 +52,6 @@ export class Diff2HtmlUI {
     if (this.config.highlight) this.highlightCode();
     if (this.config.fileListToggle) this.fileListToggle(this.config.fileListStartVisible);
     if (this.config.fileContentToggle) this.fileContentToggle();
-    if (this.config.stickyFileHeaders) this.stickyFileHeaders();
   }
 
   synchronisedScroll(): void {
@@ -137,42 +132,31 @@ export class Diff2HtmlUI {
   }
 
   highlightCode(): void {
-    const hljs = this.hljs;
-    if (hljs === null) {
+    if (this.hljs === null) {
       throw new Error('Missing a `highlight.js` implementation. Please provide one when instantiating Diff2HtmlUI.');
     }
 
     // Collect all the diff files and execute the highlight on their lines
     const files = this.targetElement.querySelectorAll('.d2h-file-wrapper');
     files.forEach(file => {
+      // HACK: help Typescript know that `this.hljs` is defined since we already checked it
+      if (this.hljs === null) return;
       const language = file.getAttribute('data-lang');
-
-      if (!(this.config.highlightLanguages instanceof Map)) {
-        this.config.highlightLanguages = new Map(Object.entries(this.config.highlightLanguages));
-      }
-
-      let hljsLanguage =
-        language && this.config.highlightLanguages.has(language)
-          ? this.config.highlightLanguages.get(language)!
-          : language
-            ? getLanguage(language)
-            : 'plaintext';
-
-      // Fallback to plaintext in case language is not loaded
-      if (hljs.getLanguage(hljsLanguage) === undefined) {
-        hljsLanguage = 'plaintext';
-      }
+      const hljsLanguage = language ? getLanguage(language) : 'plaintext';
 
       // Collect all the code lines and execute the highlight on them
       const codeLines = file.querySelectorAll('.d2h-code-line-ctn');
       codeLines.forEach(line => {
+        // HACK: help Typescript know that `this.hljs` is defined since we already checked it
+        if (this.hljs === null) return;
+
         const text = line.textContent;
         const lineParent = line.parentNode;
 
         if (text === null || lineParent === null || !this.isElement(lineParent)) return;
 
         const result: HighlightResult = closeTags(
-          hljs.highlight(text, {
+          this.hljs.highlight(text, {
             language: hljsLanguage,
             ignoreIllegals: true,
           }),
@@ -194,12 +178,6 @@ export class Diff2HtmlUI {
     });
   }
 
-  stickyFileHeaders(): void {
-    this.targetElement.querySelectorAll('.d2h-file-header').forEach(header => {
-      header.classList.add('d2h-sticky-header');
-    });
-  }
-
   /**
    * @deprecated since version 3.1.0
    */

src/ui/js/diff2html-ui-slim.ts

@@ -9,5 +9,4 @@ export class Diff2HtmlUI extends Diff2HtmlUIBase {
   }
 }
 
-export { defaultDiff2HtmlUIConfig };
-export type { Diff2HtmlUIConfig };
+export { Diff2HtmlUIConfig, defaultDiff2HtmlUIConfig };

src/ui/js/diff2html-ui.ts

@@ -9,5 +9,4 @@ export class Diff2HtmlUI extends Diff2HtmlUIBase {
   }
 }
 
-export { defaultDiff2HtmlUIConfig };
-export type { Diff2HtmlUIConfig };
+export { Diff2HtmlUIConfig, defaultDiff2HtmlUIConfig };

tsconfig.eslint.json

@@ -1,5 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "exclude": ["node_modules"],
-  "include": ["./**/*"]
-}

tsconfig.json

@@ -1,37 +1,28 @@
 {
-  "include": ["src/**/*", "typings/**/*"],
-  "exclude": ["node_modules", "src/__tests__/**"],
   "compilerOptions": {
-    "outDir": "bundles-out",
-    "module": "CommonJS",
-    "moduleResolution": "Node",
-    "target": "ES6",
-    "lib": ["ES6", "DOM"],
-    "jsx": "preserve",
+    "outDir": "./_target",
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "lib": ["es2020", "dom"],
     "allowJs": false,
-    "checkJs": false,
-    "importHelpers": false,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "skipLibCheck": true,
-    "resolveJsonModule": true,
     "declaration": true,
     "declarationMap": true,
-    "sourceMap": true,
-    "noEmit": false,
-    "forceConsistentCasingInFileNames": true,
-    "isolatedModules": true,
-    "incremental": false,
     "strictNullChecks": true,
     "removeComments": true,
     "preserveConstEnums": true,
+    "sourceMap": true,
     "alwaysStrict": true,
+    "strict": true,
     "noImplicitAny": true,
-    "noImplicitThis": true
-  }
+    "noImplicitThis": true,
+    "noUnusedParameters": true,
+    "noUnusedLocals": true,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true,
+    "forceConsistentCasingInFileNames": true,
+    "esModuleInterop": true
+  },
+  "include": ["./src/**/*", "./typings/**/*"],
+  "exclude": ["node_modules", "./src/__tests__/*"]
 }

typings/merge.d.ts

@@ -1,3 +1,4 @@
 declare module 'merge' {
+  // eslint-disable-next-line @typescript-eslint/ban-types
   export function recursive(clone: boolean, ...items: object[]): object;
 }

typings/wontache/wontache.d.ts

@@ -0,0 +1,13 @@
+declare module 'wontache' {
+  export default function compile(template: string | object): CompiledTemplate;
+  type Partials = {
+    [_: string]: string | object;
+  };
+  type Options = {
+    partials?: Partials;
+  };
+  interface CompiledTemplate {
+    (data: object, opt?: Options): string;
+    source: string;
+  }
+}

webpack.website.ts

@@ -3,6 +3,7 @@ import path from 'path';
 import webpack from 'webpack';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import MiniCssExtractPlugin from 'mini-css-extract-plugin';
+// eslint-disable-next-line import/default
 import CopyPlugin from 'copy-webpack-plugin';
 
 const pages = ['index', 'demo'];

website/templates/pages/demo/content.handlebars

@@ -2,7 +2,7 @@
   <div class="hero-body">
     <div class="container">
       <h1 class="title is-size-1 is-spaced">Demo<a href="#help">
-          <svg fill="currentColor" height="32" class="octicon octicon-unverified" viewBox="0 0 16 16" version="1.1" width="64"
+          <svg height="32" class="octicon octicon-unverified" viewBox="0 0 16 16" version="1.1" width="64"
             aria-hidden="true">
             <path
               d="M15.67 7.06l-1.08-1.34c-.17-.22-.28-.48-.31-.77l-.19-1.7a1.51 1.51 0 0 0-1.33-1.33l-1.7-.19c-.3-.03-.56-.16-.78-.33L8.94.32c-.55-.44-1.33-.44-1.88 0L5.72 1.4c-.22.17-.48.28-.77.31l-1.7.19c-.7.08-1.25.63-1.33 1.33l-.19 1.7c-.03.3-.16.56-.33.78L.32 7.05c-.44.55-.44 1.33 0 1.88l1.08 1.34c.17.22.28.48.31.77l.19 1.7c.08.7.63 1.25 1.33 1.33l1.7.19c.3.03.56.16.78.33l1.34 1.08c.55.44 1.33.44 1.88 0l1.34-1.08c.22-.17.48-.28.77-.31l1.7-.19c.7-.08 1.25-.63 1.33-1.33l.19-1.7c.03-.3.16-.56.33-.78l1.08-1.34c.44-.55.44-1.33 0-1.88zM9 11.5c0 .28-.22.5-.5.5h-1c-.27 0-.5-.22-.5-.5v-1c0-.28.23-.5.5-.5h1c.28 0 .5.22.5.5v1zm1.56-4.89c-.06.17-.17.33-.3.47-.13.16-.14.19-.33.38-.16.17-.31.3-.52.45-.11.09-.2.19-.28.27-.08.08-.14.17-.19.27-.05.1-.08.19-.11.3-.03.11-.03.13-.03.25H7.13c0-.22 0-.31.03-.48.03-.19.08-.36.14-.52.06-.14.14-.28.25-.42.11-.13.23-.25.41-.38.27-.19.36-.3.48-.52.12-.22.2-.38.2-.59 0-.27-.06-.45-.2-.58-.13-.13-.31-.19-.58-.19-.09 0-.19.02-.3.05-.11.03-.17.09-.25.16-.08.07-.14.11-.2.2a.41.41 0 0 0-.09.28h-2c0-.38.13-.56.27-.83.16-.27.36-.5.61-.67.25-.17.55-.3.88-.38.33-.08.7-.13 1.09-.13.44 0 .83.05 1.17.13.34.09.63.22.88.39.23.17.41.38.55.63.13.25.19.55.19.88 0 .22 0 .42-.08.59l-.02-.01z">
@@ -33,7 +33,7 @@
     </div>
 
     <div class="columns is-desktop is-multiline">
-      <div class="column is-one-sixth-widescreen">
+      <div class="column is-one-fifth-widescreen">
         <label title="Output format of the HTML, either line by line or side by side">
           <p>Output Format</p>
           <select class="options-label-value" id="diff-url-options-output-format" name="outputFormat">
@@ -42,24 +42,14 @@
           </select>
         </label>
       </div>
-      <div class="column is-one-sixth-widescreen">
-        <label title="Color scheme to render. Auto uses user preference.">
-          <p>Color Scheme</p>
-          <select class="options-label-value" id="diff-url-options-color-scheme" name="colorScheme">
-            <option value="light" selected>Light</option>
-            <option value="dark">Dark</option>
-            <option value="auto">Auto</option>
-          </select>
-        </label>
-      </div>
-      <div class="column is-one-sixth-widescreen">
+      <div class="column is-one-fifth-widescreen">
         <label title="Show the file list summary before the diff">
           <p>File Summary</p>
           <input class="options-label-value" id="diff-url-options-show-files" type="checkbox" name="drawFileList"
             checked />
         </label>
       </div>
-      <div class="column is-one-sixth-widescreen">
+      <div class="column is-one-fifth-widescreen">
         <label title="Level of matching for the comparison algorithm">
           <p>Matching Type</p>
           <select class="options-label-value" id="diff-url-options-matching" name="matching">
@@ -69,14 +59,14 @@
           </select>
         </label>
       </div>
-      <div class="column is-one-sixth-widescreen">
+      <div class="column is-one-fifth-widescreen">
         <label title="Similarity threshold for the matching algorithm">
           <p>Words Threshold</p>
           <input class="options-label-value" id="diff-url-options-match-words-threshold" type="number"
             name="matchWordsThreshold" value="0.25" step="0.05" min="0" max="1" />
         </label>
       </div>
-      <div class="column is-one-sixth-widescreen">
+      <div class="column is-one-fifth-widescreen">
         <label title="Maximum number of comparison performed by the matching algorithm in a block of changes">
           <p>Max Comparisons</p>
           <input class="options-label-value" id="diff-url-options-matching-max-comparisons" type="number"
@@ -144,4 +134,4 @@
       providing better diff support for existing online services.
     </p>
   </div>
-</section>
+</section>

website/templates/pages/demo/demo.css

@@ -5,21 +5,3 @@
 .diff-url-btn.is-small {
   font-size: 0.85rem;
 }
-
-.d2h-dark-color-scheme .title {
-  color: #fff;
-}
-
-.d2h-dark-color-scheme .footer {
-  background-color: #2d2d2d;
-}
-
-@media (prefers-color-scheme: dark) {
-  .d2h-auto-color-scheme .title {
-    color: #fff;
-  }
-
-  .d2h-auto-color-scheme .footer {
-    background-color: #2d2d2d;
-  }
-}

website/templates/pages/demo/demo.ts

@@ -2,11 +2,9 @@ import { Diff2HtmlUI, defaultDiff2HtmlUIConfig, Diff2HtmlUIConfig } from '../../
 
 import '../../../main.ts';
 import '../../../main.css';
-import './github-highlights.css';
+import 'highlight.js/styles/github.css';
 import '../../../../src/ui/css/diff2html.css';
 import './demo.css';
-import { colorSchemeToCss } from '../../../../src/render-utils';
-import { ColorSchemeType } from '../../../../src/types';
 
 /*
  * Example URLs:
@@ -24,7 +22,7 @@ import { ColorSchemeType } from '../../../../src/types';
 type URLParams = {
   diff?: string;
   diffTooBigMessage?: string;
-  [key: string]: string | boolean | number | Map<string, string> | undefined;
+  [key: string]: string | boolean | number | undefined;
 };
 
 const searchParam = 'diff';
@@ -123,16 +121,10 @@ function prepareRequest(url: string): Request {
 
 function getConfiguration(urlParams: URLParams): Diff2HtmlUIConfig {
   // Removing `diff` and `diffTooBigMessage` form `urlParams` to avoid being inserted
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { diff, diffTooBigMessage, ...urlParamsRest } = urlParams;
-
-  const defaultColorScheme: ColorSchemeType =
-    window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-      ? ColorSchemeType.DARK
-      : ColorSchemeType.LIGHT;
-
   const config: URLParams = {
     ...defaultDiff2HtmlUIConfig,
-    colorScheme: defaultColorScheme,
     ...urlParamsRest,
   };
 
@@ -140,8 +132,8 @@ function getConfiguration(urlParams: URLParams): Diff2HtmlUIConfig {
     const newObject = !Number.isNaN(Number(v))
       ? { [k]: Number(v) }
       : v === 'true' || v === 'false'
-        ? { [k]: Boolean(v) }
-        : { [k]: v };
+      ? { [k]: Boolean(v) }
+      : { [k]: v };
     return { ...object, ...newObject };
   }, {});
 }
@@ -163,16 +155,9 @@ async function getDiff(request: Request): Promise<string> {
 
 function draw(diffString: string, config: Diff2HtmlUIConfig, elements: Elements): void {
   const diff2htmlUi = new Diff2HtmlUI(elements.structure.diffTarget, diffString, config);
-
-  setBodyColorScheme(diff2htmlUi.config.colorScheme);
-
   diff2htmlUi.draw();
 }
 
-function setBodyColorScheme(colorScheme: ColorSchemeType): void {
-  document.body.className = colorSchemeToCss(colorScheme);
-}
-
 async function prepareInitialState(elements: Elements): Promise<[Diff2HtmlUIConfig, string]> {
   const urlParams = getParamsFromSearch(window.location.search);
   const currentUrl = (urlParams && urlParams[searchParam]) || 'https://github.com/rtfpessoa/diff2html/pull/106';
@@ -215,7 +200,6 @@ type Elements = {
   };
   options: {
     outputFormat: HTMLInputElement;
-    colorScheme: HTMLInputElement;
     matching: HTMLInputElement;
     wordsThreshold: HTMLInputElement;
     matchingMaxComparisons: HTMLInputElement;
@@ -251,7 +235,6 @@ function getHTMLElementById(id: string): HTMLElement {
 
 document.addEventListener('DOMContentLoaded', async () => {
   // Improves browser compatibility
-  // eslint-disable-next-line @typescript-eslint/no-require-imports
   require('whatwg-fetch');
 
   const drawAndUpdateUrl = async (
@@ -276,7 +259,6 @@ document.addEventListener('DOMContentLoaded', async () => {
     },
     options: {
       outputFormat: getHTMLInputElementById('diff-url-options-output-format'),
-      colorScheme: getHTMLInputElementById('diff-url-options-color-scheme'),
       matching: getHTMLInputElementById('diff-url-options-matching'),
       wordsThreshold: getHTMLInputElementById('diff-url-options-match-words-threshold'),
       matchingMaxComparisons: getHTMLInputElementById('diff-url-options-matching-max-comparisons'),
@@ -289,13 +271,12 @@ document.addEventListener('DOMContentLoaded', async () => {
   let [config, diffString] = await prepareInitialState(elements);
 
   // Update HTML inputs from any changes in URL
-  if (config.outputFormat) elements.options.outputFormat.value = config.outputFormat;
-  if (config.colorScheme) elements.options.colorScheme.value = config.colorScheme;
-  if (config.drawFileList) elements.checkboxes.drawFileList.checked = config.drawFileList;
-  if (config.matching) elements.options.matching.value = config.matching;
-  if (config.matchWordsThreshold) elements.options.wordsThreshold.value = config.matchWordsThreshold.toString();
-  if (config.matchingMaxComparisons)
-    elements.options.matchingMaxComparisons.value = config.matchingMaxComparisons.toString();
+  config.outputFormat && (elements.options.outputFormat.value = config.outputFormat);
+  config.drawFileList && (elements.checkboxes.drawFileList.checked = config.drawFileList);
+  config.matching && (elements.options.matching.value = config.matching);
+  config.matchWordsThreshold && (elements.options.wordsThreshold.value = config.matchWordsThreshold.toString());
+  config.matchingMaxComparisons &&
+    (elements.options.matchingMaxComparisons.value = config.matchingMaxComparisons.toString());
 
   Object.entries(elements.options).forEach(([option, element]) =>
     element.addEventListener('change', () => {

website/templates/pages/demo/github-highlights.css

@@ -1,332 +0,0 @@
-/*!
-  Theme Adapted from highlight.js github theme
-  Theme: Modified GitHub Dark
-  Description: Dark theme as seen on github.com, modified for diff2html demo
-  Author: github.com
-  Maintainer: @Hirse
-  Updated: 2021-05-15
-
-  Outdated base version: https://github.com/primer/github-syntax-dark
-  Current colors taken from GitHub's CSS
-*/
-
-pre code.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 1em;
-}
-code.hljs {
-  padding: 3px 5px;
-}
-
-.hljs {
-  color: #24292e;
-}
-.hljs-doctag,
-.hljs-keyword,
-.hljs-meta .hljs-keyword,
-.hljs-template-tag,
-.hljs-template-variable,
-.hljs-type,
-.hljs-variable.language_ {
-  color: #d73a49;
-}
-.hljs-title,
-.hljs-title.class_,
-.hljs-title.class_.inherited__,
-.hljs-title.function_ {
-  color: #6f42c1;
-}
-.hljs-attr,
-.hljs-attribute,
-.hljs-literal,
-.hljs-meta,
-.hljs-number,
-.hljs-operator,
-.hljs-selector-attr,
-.hljs-selector-class,
-.hljs-selector-id,
-.hljs-variable {
-  color: #005cc5;
-}
-.hljs-meta .hljs-string,
-.hljs-regexp,
-.hljs-string {
-  color: #032f62;
-}
-.hljs-built_in,
-.hljs-symbol {
-  color: #e36209;
-}
-.hljs-code,
-.hljs-comment,
-.hljs-formula {
-  color: #6a737d;
-}
-.hljs-name,
-.hljs-quote,
-.hljs-selector-pseudo,
-.hljs-selector-tag {
-  color: #22863a;
-}
-.hljs-subst {
-  color: #24292e;
-}
-.hljs-section {
-  color: #005cc5;
-  font-weight: 700;
-}
-.hljs-bullet {
-  color: #735c0f;
-}
-.hljs-emphasis {
-  color: #24292e;
-  font-style: italic;
-}
-.hljs-strong {
-  color: #24292e;
-  font-weight: 700;
-}
-.hljs-addition {
-  color: #22863a;
-  background-color: #f0fff4;
-}
-.hljs-deletion {
-  color: #b31d28;
-  background-color: #ffeef0;
-}
-
-.d2h-dark-color-scheme .hljs {
-  color: #c9d1d9;
-}
-.d2h-dark-color-scheme .hljs-doctag,
-.d2h-dark-color-scheme .hljs-keyword,
-.d2h-dark-color-scheme .hljs-meta .hljs-keyword,
-.d2h-dark-color-scheme .hljs-template-tag,
-.d2h-dark-color-scheme .hljs-template-variable,
-.d2h-dark-color-scheme .hljs-type,
-.d2h-dark-color-scheme .hljs-variable.language_ {
-  color: #ff7b72;
-}
-.d2h-dark-color-scheme .hljs-title,
-.d2h-dark-color-scheme .hljs-title.class_,
-.d2h-dark-color-scheme .hljs-title.class_.inherited__,
-.d2h-dark-color-scheme .hljs-title.function_ {
-  color: #d2a8ff;
-}
-.d2h-dark-color-scheme .hljs-attr,
-.d2h-dark-color-scheme .hljs-attribute,
-.d2h-dark-color-scheme .hljs-literal,
-.d2h-dark-color-scheme .hljs-meta,
-.d2h-dark-color-scheme .hljs-number,
-.d2h-dark-color-scheme .hljs-operator,
-.d2h-dark-color-scheme .hljs-selector-attr,
-.d2h-dark-color-scheme .hljs-selector-class,
-.d2h-dark-color-scheme .hljs-selector-id,
-.d2h-dark-color-scheme .hljs-variable {
-  color: #79c0ff;
-}
-.d2h-dark-color-scheme .hljs-meta .hljs-string,
-.d2h-dark-color-scheme .hljs-regexp,
-.d2h-dark-color-scheme .hljs-string {
-  color: #a5d6ff;
-}
-.d2h-dark-color-scheme .hljs-built_in,
-.d2h-dark-color-scheme .hljs-symbol {
-  color: #ffa657;
-}
-.d2h-dark-color-scheme .hljs-code,
-.d2h-dark-color-scheme .hljs-comment,
-.d2h-dark-color-scheme .hljs-formula {
-  color: #8b949e;
-}
-.d2h-dark-color-scheme .hljs-name,
-.d2h-dark-color-scheme .hljs-quote,
-.d2h-dark-color-scheme .hljs-selector-pseudo,
-.d2h-dark-color-scheme .hljs-selector-tag {
-  color: #7ee787;
-}
-.d2h-dark-color-scheme .hljs-subst {
-  color: #c9d1d9;
-}
-.d2h-dark-color-scheme .hljs-section {
-  color: #1f6feb;
-  font-weight: 700;
-}
-.d2h-dark-color-scheme .hljs-bullet {
-  color: #f2cc60;
-}
-.d2h-dark-color-scheme .hljs-emphasis {
-  color: #c9d1d9;
-  font-style: italic;
-}
-.d2h-dark-color-scheme .hljs-strong {
-  color: #c9d1d9;
-  font-weight: 700;
-}
-.d2h-dark-color-scheme .hljs-addition {
-  color: #aff5b4;
-  background-color: #033a16;
-}
-.d2h-dark-color-scheme .hljs-deletion {
-  color: #ffdcd7;
-  background-color: #67060c;
-}
-
-@media (prefers-color-scheme: dark) {
-  .d2h-auto-color-scheme .hljs {
-    color: #c9d1d9;
-  }
-  .d2h-auto-color-scheme .hljs-doctag,
-  .d2h-auto-color-scheme .hljs-keyword,
-  .d2h-auto-color-scheme .hljs-meta .hljs-keyword,
-  .d2h-auto-color-scheme .hljs-template-tag,
-  .d2h-auto-color-scheme .hljs-template-variable,
-  .d2h-auto-color-scheme .hljs-type,
-  .d2h-auto-color-scheme .hljs-variable.language_ {
-    color: #ff7b72;
-  }
-  .d2h-auto-color-scheme .hljs-title,
-  .d2h-auto-color-scheme .hljs-title.class_,
-  .d2h-auto-color-scheme .hljs-title.class_.inherited__,
-  .d2h-auto-color-scheme .hljs-title.function_ {
-    color: #d2a8ff;
-  }
-  .d2h-auto-color-scheme .hljs-attr,
-  .d2h-auto-color-scheme .hljs-attribute,
-  .d2h-auto-color-scheme .hljs-literal,
-  .d2h-auto-color-scheme .hljs-meta,
-  .d2h-auto-color-scheme .hljs-number,
-  .d2h-auto-color-scheme .hljs-operator,
-  .d2h-auto-color-scheme .hljs-selector-attr,
-  .d2h-auto-color-scheme .hljs-selector-class,
-  .d2h-auto-color-scheme .hljs-selector-id,
-  .d2h-auto-color-scheme .hljs-variable {
-    color: #79c0ff;
-  }
-  .d2h-auto-color-scheme .hljs-meta .hljs-string,
-  .d2h-auto-color-scheme .hljs-regexp,
-  .d2h-auto-color-scheme .hljs-string {
-    color: #a5d6ff;
-  }
-  .d2h-auto-color-scheme .hljs-built_in,
-  .d2h-auto-color-scheme .hljs-symbol {
-    color: #ffa657;
-  }
-  .d2h-auto-color-scheme .hljs-code,
-  .d2h-auto-color-scheme .hljs-comment,
-  .d2h-auto-color-scheme .hljs-formula {
-    color: #8b949e;
-  }
-  .d2h-auto-color-scheme .hljs-name,
-  .d2h-auto-color-scheme .hljs-quote,
-  .d2h-auto-color-scheme .hljs-selector-pseudo,
-  .d2h-auto-color-scheme .hljs-selector-tag {
-    color: #7ee787;
-  }
-  .d2h-auto-color-scheme .hljs-subst {
-    color: #c9d1d9;
-  }
-  .d2h-auto-color-scheme .hljs-section {
-    color: #1f6feb;
-    font-weight: 700;
-  }
-  .d2h-auto-color-scheme .hljs-bullet {
-    color: #f2cc60;
-  }
-  .d2h-auto-color-scheme .hljs-emphasis {
-    color: #c9d1d9;
-    font-style: italic;
-  }
-  .d2h-auto-color-scheme .hljs-strong {
-    color: #c9d1d9;
-    font-weight: 700;
-  }
-  .d2h-auto-color-scheme .hljs-addition {
-    color: #aff5b4;
-    background-color: #033a16;
-  }
-  .d2h-auto-color-scheme .hljs-deletion {
-    color: #ffdcd7;
-    background-color: #67060c;
-  }
-}
-
-@media (prefers-color-scheme: light) {
-  .d2h-auto-color-scheme .hljs {
-    color: #24292e;
-  }
-  .d2h-auto-color-scheme .hljs-doctag,
-  .d2h-auto-color-scheme .hljs-keyword,
-  .d2h-auto-color-scheme .hljs-meta .hljs-keyword,
-  .d2h-auto-color-scheme .hljs-template-tag,
-  .d2h-auto-color-scheme .hljs-template-variable,
-  .d2h-auto-color-scheme .hljs-type,
-  .d2h-auto-color-scheme .hljs-variable.language_ {
-    color: #d73a49;
-  }
-  .d2h-auto-color-scheme .hljs-title,
-  .d2h-auto-color-scheme .hljs-title.class_,
-  .d2h-auto-color-scheme .hljs-title.class_.inherited__,
-  .d2h-auto-color-scheme .hljs-title.function_ {
-    color: #6f42c1;
-  }
-  .d2h-auto-color-scheme .hljs-attr,
-  .d2h-auto-color-scheme .hljs-attribute,
-  .d2h-auto-color-scheme .hljs-literal,
-  .d2h-auto-color-scheme .hljs-meta,
-  .d2h-auto-color-scheme .hljs-number,
-  .d2h-auto-color-scheme .hljs-operator,
-  .d2h-auto-color-scheme .hljs-selector-attr,
-  .d2h-auto-color-scheme .hljs-selector-class,
-  .d2h-auto-color-scheme .hljs-selector-id,
-  .d2h-auto-color-scheme .hljs-variable {
-    color: #005cc5;
-  }
-  .d2h-auto-color-scheme .hljs-meta .hljs-string,
-  .d2h-auto-color-scheme .hljs-regexp,
-  .d2h-auto-color-scheme .hljs-string {
-    color: #032f62;
-  }
-  .d2h-auto-color-scheme .hljs-built_in,
-  .d2h-auto-color-scheme .hljs-symbol {
-    color: #e36209;
-  }
-  .d2h-auto-color-scheme .hljs-code,
-  .d2h-auto-color-scheme .hljs-comment,
-  .d2h-auto-color-scheme .hljs-formula {
-    color: #6a737d;
-  }
-  .d2h-auto-color-scheme .hljs-name,
-  .d2h-auto-color-scheme .hljs-quote,
-  .d2h-auto-color-scheme .hljs-selector-pseudo,
-  .d2h-auto-color-scheme .hljs-selector-tag {
-    color: #22863a;
-  }
-  .d2h-auto-color-scheme .hljs-subst {
-    color: #24292e;
-  }
-  .d2h-auto-color-scheme .hljs-section {
-    color: #005cc5;
-    font-weight: 700;
-  }
-  .d2h-auto-color-scheme .hljs-bullet {
-    color: #735c0f;
-  }
-  .d2h-auto-color-scheme .hljs-emphasis {
-    color: #24292e;
-    font-style: italic;
-  }
-  .d2h-auto-color-scheme .hljs-strong {
-    color: #24292e;
-    font-weight: 700;
-  }
-  .d2h-auto-color-scheme .hljs-addition {
-    color: #22863a;
-    background-color: #f0fff4;
-  }
-  .d2h-auto-color-scheme .hljs-deletion {
-    color: #b31d28;
-    background-color: #ffeef0;
-  }
-}

website/templates/pages/index/content.handlebars

@@ -72,7 +72,7 @@
             <span class="button clipboard" data-clipboard-text="npm install diff2html" title="Copy">Copy</span>
         </div>
         <p>
-            <a href="https://github.com/rtfpessoa/diff2html#usage" target="_blank" rel="noopener" rel="noreferrer">
+            <a href="https://github.com/rtfpessoa/diff2html#how-to-use" target="_blank" rel="noopener" rel="noreferrer">
                 Find usage examples in the Docs
             </a>
         </p>
@@ -466,7 +466,7 @@
                     </footer>
                 </div>
             </div>
-
+            
             <div class="column is-one-quarter-widescreen is-flex">
                 <div class="box is-flex is-fullwidth is-vertical">
                     <header>
@@ -481,7 +481,7 @@
                     </footer>
                 </div>
             </div>
-
+            
             <div class="column is-one-quarter-widescreen is-flex">
                 <div class="box is-flex is-fullwidth is-vertical">
                     <header>
@@ -491,8 +491,8 @@
                         <p>Displays a tabular difference of a csv file or a split difference of any file in an Atom pane</p>
                     </section>
                     <footer>
-                        <a href="https://github.com/jstritch/git-tabular-diff" target="_blank" rel="noopener"
-                            rel="noreferrer">View GitHub</a>
+                        <a href="https://atom.io/packages/git-tabular-diff" target="_blank" rel="noopener"
+                            rel="noreferrer">Website</a>
                     </footer>
                 </div>
             </div>
@@ -510,7 +510,7 @@
             <a href="https://gitter.im/rtfpessoa/diff2html" target="_blank" rel="noopener" rel="noreferrer">Gitter</a>.
             Need any help?
         </p>
-        <a href="https://github.com/rtfpessoa/diff2html#usage" target="_blank" rel="noopener" rel="noreferrer">
+        <a href="https://github.com/rtfpessoa/diff2html#how-to-use" target="_blank" rel="noopener" rel="noreferrer">
             Read more in the Docs
         </a>
     </div>

website/templates/pages/index/index.css

@@ -8,11 +8,7 @@
 }
 
 .hero-booticon {
-  font-family:
-    Helvetica Neue,
-    Helvetica,
-    Arial,
-    sans-serif;
+  font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
   margin: 0 auto 30px;
   width: 100%;
   font-size: 8vw;

website/templates/pages/index/index.ts

@@ -4,4 +4,5 @@ import '../../../main.ts';
 import '../../../main.css';
 import './index.css';
 
+// eslint-disable-next-line no-new
 new Clipboard(document.getElementsByClassName('clipboard')[0]);

website/templates/template.handlebars

@@ -78,7 +78,7 @@
                 <a href="https://twitter.com/rtfpessoa" target="_blank" rel="noopener" rel="noreferrer">@rtfpessoa</a>.
             </p>
             <p>
-                <a class="footer-list-link" href="https://github.com/rtfpessoa/diff2html#usage" target="_blank"
+                <a class="footer-list-link" href="https://github.com/rtfpessoa/diff2html#how-to-use" target="_blank"
                     rel="noopener" rel="noreferrer">FAQ</a>
                 -
                 <a class="footer-list-link" href="https://diff2html.xyz">diff2html</a>
@@ -102,4 +102,4 @@
 </script>
 </body>
 
-</html>
+</html>