Merge 135913d4bb into 4de87bf099

.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/release.yml

@@ -19,7 +19,7 @@ jobs:
     environment: 'production'
     steps:
       - name: Download docs
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: docs
           path: docs/

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

@@ -25,7 +25,7 @@ jobs:
         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 "${NEXT_VERSION}" > .version
           echo "version=${NEXT_VERSION}" >> $GITHUB_ENV
       - name: Get next npm tag name
         run: |
@@ -37,22 +37,22 @@ jobs:
             export PUBLISH_TAG="pr"
           fi
           echo "Next tag is ${PUBLISH_TAG}"
-          echo "${PUBLISH_TAG}" > publish-tag.txt
+          echo "${PUBLISH_TAG}" > .tag
       - name: Upload versions
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: versions
           if-no-files-found: error
           path: |
-            next-version.txt
+            .version
-            publish-tag.txt
+            .tag
 
   build:
     runs-on: ubuntu-latest
     needs: [version]
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x, 22.x]
+        node-version: [16.x, 18.x, 20.x]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -64,8 +64,8 @@ jobs:
           cache: 'npm'
       - name: Log environment setup
         run: |
-          node -v
+            node -v
-          npm -v
+            npm -v
       - name: Install dependencies
         run: npm install
       - name: Build templates
@@ -82,66 +82,70 @@ jobs:
         with:
           fetch-depth: 0
       - name: Download versions
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
           name: versions
       - name: Store version
-        run: echo "version=$(cat next-version.txt)" >> $GITHUB_ENV
+        run: echo "version=$(cat .version)" >> $GITHUB_ENV
       - name: Configure Git
         run: |
-          git config user.email "gh-actions@users.noreply.github.com"
+            git config user.email "gh-actions@users.noreply.github.com"
-          git config user.name "GitHub Actions"
+            git config user.name "GitHub Actions"
       - name: Tag commit
         uses: tvdias/github-tagger@v0.0.1
         with:
-          repo-token: '${{ secrets.GITHUB_TOKEN }}'
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"
-          tag: '${{ env.version }}'
+          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'
+          node-version: '18.x'
       - name: Configure NPM version
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
         run: |
-          rm -f .npmrc
+            rm -f .npmrc
-          touch .npmrc
+            touch .npmrc
-          echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
+            echo "//registry.npmjs.org/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
-          echo "registry=https://registry.npmjs.org/" >> .npmrc
+            echo "registry=https://registry.npmjs.org/" >> .npmrc
-          echo "access=public" >> .npmrc
+            echo "access=public" >> .npmrc
-          echo "save-exact=true" >> .npmrc
+            echo "save-exact=true" >> .npmrc
       - name: Version package
         run: |
-          # Update version in packages to publish
+            # Update version in packages to publish
-          npm version $(cat next-version.txt) -m "Release version %s"
+            npm version $(cat .version) -m "Release version %s"
       - name: Publish to NPM
-        run: npm publish --tag $(cat publish-tag.txt)
+        run: npm publish --tag $(cat .tag)
       - uses: actions/setup-node@v3
         with:
-          node-version: '22.x'
+          node-version: '18.x'
           registry-url: 'https://npm.pkg.github.com'
       - name: Configure NPM version
         env:
           NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          rm -f .npmrc
+            rm -f .npmrc
-          touch .npmrc
+            touch .npmrc
-          echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
+            echo "//npm.pkg.github.com/:_authToken=${NODE_AUTH_TOKEN}" >> .npmrc
-          echo "@rtfpessoa:registry=https://npm.pkg.github.com/" >> .npmrc
+            echo "@rtfpessoa:registry=https://npm.pkg.github.com/" >> .npmrc
-          echo "access=public" >> .npmrc
+            echo "access=public" >> .npmrc
-          echo "save-exact=true" >> .npmrc
+            echo "save-exact=true" >> .npmrc
+      - name: Version package
+        run: |
+            # Update version in packages to publish
+            npm version $(cat .version) -m "Release version %s"
       - name: Publish to GPR
         run: |
-          # HACK: Override npm package name to be able to publish in GitHub
+            # HACK: Override npm package name to be able to publish in GitHub
-          sed -i 's/^  "name":.*/  "name": "@rtfpessoa\/diff2html",/g' package.json
+            sed -i 's/^  "name":.*/  "name": "@rtfpessoa\/diff2html",/g' package.json
-          echo "Going to publish version $(cat next-version.txt) to GitHub"
+            echo "Going to publish version $(cat .version) to GitHub"
-          npm publish --tag $(cat publish-tag.txt)
+            npm publish --tag $(cat .tag)
-          # HACK: Restore npm package name
+            # HACK: Restore npm package name
-          sed -i 's/^  "name":.*/  "name": "diff2html",/g' package.json
+            sed -i 's/^  "name":.*/  "name": "diff2html",/g' package.json
       - name: Upload docs
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: docs
           if-no-files-found: error

.gitignore

@@ -29,18 +29,8 @@ bower_components/
 # Terraform
 /terraform/.terraform
 
-# Compiled templates
 /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

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,6 +35,7 @@
     "node": ">=12"
   },
   "scripts": {
+    "eslint": "eslint --ignore-path .gitignore \"**/*.{js,jsx,ts,tsx,json}\"",
     "lint:staged": "lint-staged",
     "lint:check": "eslint",
     "lint:fix": "eslint --fix",
@@ -42,7 +43,7 @@
     "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:commonjs": "rm -rf lib; tsc -p tsconfig.json --outDir lib",
     "build:esm": "rm -rf lib-esm; tsc -p tsconfig.json -m ESNext --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",
@@ -63,7 +64,7 @@
     "start:website": "webpack serve --mode development --config webpack.website.ts",
     "preversion": "npm run validate",
     "version": "git add -A package.json",
-    "prepare": "husky"
+    "prepare": "husky install"
   },
   "main": "./lib/diff2html.js",
   "module": "./lib-esm/diff2html.js",
@@ -81,60 +82,63 @@
     ]
   },
   "dependencies": {
-    "diff": "^7.0.0",
+    "diff": "5.1.0",
     "hogan.js": "3.0.2"
   },
   "optionalDependencies": {
     "highlight.js": "11.9.0"
   },
   "devDependencies": {
-    "prettier-2": "npm:prettier@^2",
+    "@types/diff": "5.0.9",
-    "@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/jest": "29.5.11",
-    "@types/node": "^22.10.2",
+    "@types/node": "20.11.0",
     "@types/nopt": "3.0.32",
+    "@typescript-eslint/eslint-plugin": "6.18.1",
+    "@typescript-eslint/parser": "6.18.1",
     "all-contributors-cli": "^6.24.0",
-    "autoprefixer": "^10.4.20",
+    "autoprefixer": "10.4.16",
-    "bulma": "^1.0.2",
+    "bulma": "^0.9.4",
     "clipboard": "2.0.11",
-    "copy-webpack-plugin": "^12.0.2",
+    "copy-webpack-plugin": "12.0.1",
-    "css-loader": "^7.1.2",
+    "css-loader": "6.9.0",
-    "cssnano": "^7.0.6",
+    "cssnano": "6.0.3",
-    "eslint": "^9.17.0",
+    "eslint": "8.56.0",
-    "eslint-plugin-jest": "28.10.0",
+    "eslint-config-prettier": "9.1.0",
-    "eslint-plugin-promise": "^7.2.1",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jest": "27.6.3",
+    "eslint-plugin-json": "3.1.0",
+    "eslint-plugin-node": "11.1.0",
+    "eslint-plugin-optimize-regex": "1.2.1",
+    "eslint-plugin-promise": "6.1.1",
+    "eslint-plugin-sonarjs": "0.23.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",
+    "html-webpack-plugin": "5.6.0",
-    "husky": "^9.1.7",
+    "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",
+    "lint-staged": "15.2.0",
     "markdown-toc": "^1.2.0",
-    "mini-css-extract-plugin": "^2.9.2",
+    "mini-css-extract-plugin": "2.7.7",
     "mkdirp": "3.0.1",
-    "nopt": "^8.0.0",
+    "nopt": "7.2.0",
-    "postcss": "^8.4.49",
+    "postcss": "8.4.33",
     "postcss-cli": "11.0.0",
-    "postcss-import": "^16.1.0",
+    "postcss-import": "16.0.0",
-    "postcss-loader": "^8.1.1",
+    "postcss-loader": "7.3.4",
-    "postcss-preset-env": "^10.1.2",
+    "postcss-preset-env": "9.3.0",
-    "prettier": "^3.4.2",
+    "prettier": "3.2.1",
-    "ts-jest": "^29.2.5",
+    "ts-jest": "29.1.1",
     "ts-loader": "9.5.1",
     "ts-node": "10.9.2",
-    "typescript": "^5.7.2",
+    "typescript": "5.3.3",
-    "typescript-eslint": "^8.18.2",
     "url-loader": "4.1.1",
-    "webpack": "^5.97.1",
+    "webpack": "5.89.0",
-    "webpack-cli": "^6.0.1",
+    "webpack-cli": "5.1.4",
-    "webpack-dev-server": "^5.2.0",
+    "webpack-dev-server": "4.15.1",
     "whatwg-fetch": "3.6.20"
   },
   "resolutions": {

scripts/hulk.ts

@@ -67,7 +67,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);
   }

src/__tests__/diff-parser-tests.ts

@@ -2,6 +2,7 @@ import { parse } from '../diff-parser';
 
 describe('DiffParser', () => {
   describe('generateDiffJson', () => {
+    // eslint-disable-next-line jest/expect-expect
     it('should parse unix with \n diff', () => {
       const diff =
         'diff --git a/sample b/sample\n' +
@@ -51,6 +52,7 @@ describe('DiffParser', () => {
       `);
     });
 
+    // eslint-disable-next-line jest/expect-expect
     it('should parse windows with \r\n diff', () => {
       const diff =
         'diff --git a/sample b/sample\r\n' +
@@ -100,6 +102,7 @@ describe('DiffParser', () => {
       `);
     });
 
+    // eslint-disable-next-line jest/expect-expect
     it('should parse old os x with \r diff', () => {
       const diff =
         'diff --git a/sample b/sample\r' +
@@ -149,6 +152,7 @@ describe('DiffParser', () => {
       `);
     });
 
+    // eslint-disable-next-line jest/expect-expect
     it('should parse mixed eols diff', () => {
       const diff =
         'diff --git a/sample b/sample\n' +

src/__tests__/diff2html-tests.ts

@@ -928,7 +928,7 @@ describe('Diff2Html', () => {
             <td class="d2h-del d2h-change">
                 <div class="d2h-code-line">
                     <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn">&lt;<del>!-- commented code --</del>&gt;</span>
+                    <span class="d2h-code-line-ctn"><del>&lt;!-- commented code --&gt;</del></span>
                 </div>
             </td>
         </tr><tr>
@@ -939,7 +939,7 @@ describe('Diff2Html', () => {
             <td class="d2h-del d2h-change">
                 <div class="d2h-code-line">
                     <span class="d2h-code-line-prefix">-</span>
-                    <span class="d2h-code-line-ctn">&lt;<del>&#x2F;div</del>&gt;</span>
+                    <span class="d2h-code-line-ctn"><del>&lt;&#x2F;div</del>&gt;</span>
                 </div>
             </td>
         </tr><tr>
@@ -950,7 +950,7 @@ describe('Diff2Html', () => {
             <td class="d2h-ins d2h-change">
                 <div class="d2h-code-line">
                     <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">&lt;<ins>html</ins>&gt;</span>
+                    <span class="d2h-code-line-ctn"><ins>&lt;html&gt;</ins></span>
                 </div>
             </td>
         </tr><tr>
@@ -961,7 +961,7 @@ describe('Diff2Html', () => {
             <td class="d2h-ins d2h-change">
                 <div class="d2h-code-line">
                     <span class="d2h-code-line-prefix">+</span>
-                    <span class="d2h-code-line-ctn">&lt;<ins>body</ins>&gt;</span>
+                    <span class="d2h-code-line-ctn"><ins>&lt;body</ins>&gt;</span>
                 </div>
             </td>
         </tr>
@@ -1326,78 +1326,78 @@ describe('Diff2Html', () => {
           colorScheme: ColorSchemeType.AUTO,
         });
         expect(result).toMatchInlineSnapshot(`
-                  "<div class="d2h-file-list-wrapper d2h-auto-color-scheme">
+        "<div class="d2h-file-list-wrapper d2h-auto-color-scheme">
-                      <div class="d2h-file-list-header">
+            <div class="d2h-file-list-header">
-                          <span class="d2h-file-list-title">Files changed (1)</span>
+                <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-hide">hide</a>
-                          <a class="d2h-file-switch d2h-show">show</a>
+                <a class="d2h-file-switch d2h-show">show</a>
-                      </div>
+            </div>
-                      <ol class="d2h-file-list">
+            <ol class="d2h-file-list">
-                      <li class="d2h-file-list-line">
+            <li class="d2h-file-list-line">
-                      <span class="d2h-file-name-wrapper">
+            <span class="d2h-file-name-wrapper">
-                        <svg aria-hidden="true" class="d2h-icon d2h-changed" height="16" title="modified" version="1.1"
+              <svg aria-hidden="true" class="d2h-icon d2h-changed" height="16" title="modified" version="1.1"
-                             viewBox="0 0 14 16" width="14">
+                   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>
+                  <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-675094" class="d2h-file-name">sample</a>
+              </svg>      <a href="#d2h-675094" class="d2h-file-name">sample</a>
-                        <span class="d2h-file-stats">
+              <span class="d2h-file-stats">
-                            <span class="d2h-lines-added">+1</span>
+                  <span class="d2h-lines-added">+1</span>
-                            <span class="d2h-lines-deleted">-1</span>
+                  <span class="d2h-lines-deleted">-1</span>
-                        </span>
+              </span>
-                      </span>
+            </span>
-                  </li>
+        </li>
-                      </ol>
+            </ol>
-                  </div><div class="d2h-wrapper d2h-auto-color-scheme">
+        </div><div class="d2h-wrapper d2h-auto-color-scheme">
-                      <div id="d2h-675094" class="d2h-file-wrapper" data-lang="">
+            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="">
-                      <div class="d2h-file-header">
+            <div class="d2h-file-header">
-                      <span class="d2h-file-name-wrapper">
+            <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">
+            <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>
+                <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>
+            </svg>    <span class="d2h-file-name">sample</span>
-                      <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
+            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-                  <label class="d2h-file-collapse">
+        <label class="d2h-file-collapse">
-                      <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
-                      Viewed
+            Viewed
-                  </label>
+        </label>
-                      </div>
+            </div>
-                      <div class="d2h-file-diff">
+            <div class="d2h-file-diff">
-                          <div class="d2h-code-wrapper">
+                <div class="d2h-code-wrapper">
-                              <table class="d2h-diff-table">
+                    <table class="d2h-diff-table">
-                                  <tbody class="d2h-diff-tbody">
+                        <tbody class="d2h-diff-tbody">
-                                  <tr>
+                        <tr>
-                      <td class="d2h-code-linenumber d2h-info"></td>
+            <td class="d2h-code-linenumber d2h-info"></td>
-                      <td class="d2h-info">
+            <td class="d2h-info">
-                          <div class="d2h-code-line">@@ -1 +1 @@</div>
+                <div class="d2h-code-line">@@ -1 +1 @@</div>
-                      </td>
+            </td>
-                  </tr><tr>
+        </tr><tr>
-                      <td class="d2h-code-linenumber d2h-del d2h-change">
+            <td class="d2h-code-linenumber d2h-del d2h-change">
-                        <div class="line-num1">1</div>
+              <div class="line-num1">1</div>
-                  <div class="line-num2"></div>
+        <div class="line-num2"></div>
-                      </td>
+            </td>
-                      <td class="d2h-del d2h-change">
+            <td class="d2h-del d2h-change">
-                          <div class="d2h-code-line">
+                <div class="d2h-code-line">
-                              <span class="d2h-code-line-prefix">-</span>
+                    <span class="d2h-code-line-prefix">-</span>
-                              <span class="d2h-code-line-ctn"><del>test</del></span>
+                    <span class="d2h-code-line-ctn"><del>test</del></span>
-                          </div>
+                </div>
-                      </td>
+            </td>
-                  </tr><tr>
+        </tr><tr>
-                      <td class="d2h-code-linenumber d2h-ins d2h-change">
+            <td class="d2h-code-linenumber d2h-ins d2h-change">
-                        <div class="line-num1"></div>
+              <div class="line-num1"></div>
-                  <div class="line-num2">1</div>
+        <div class="line-num2">1</div>
-                      </td>
+            </td>
-                      <td class="d2h-ins d2h-change">
+            <td class="d2h-ins d2h-change">
-                          <div class="d2h-code-line">
+                <div class="d2h-code-line">
-                              <span class="d2h-code-line-prefix">+</span>
+                    <span class="d2h-code-line-prefix">+</span>
-                              <span class="d2h-code-line-ctn"><ins>test1</ins></span>
+                    <span class="d2h-code-line-ctn"><ins>test1</ins></span>
-                          </div>
+                </div>
-                      </td>
+            </td>
-                  </tr>
+        </tr>
-                                  </tbody>
+                        </tbody>
-                              </table>
+                    </table>
-                          </div>
+                </div>
-                      </div>
+            </div>
-                  </div>
+        </div>
-                  </div>"
+        </div>"
-                `);
+        `);
       });
     });
 
@@ -1468,78 +1468,78 @@ describe('Diff2Html', () => {
           colorScheme: ColorSchemeType.DARK,
         });
         expect(result).toMatchInlineSnapshot(`
-                  "<div class="d2h-file-list-wrapper d2h-dark-color-scheme">
+        "<div class="d2h-file-list-wrapper d2h-dark-color-scheme">
-                      <div class="d2h-file-list-header">
+            <div class="d2h-file-list-header">
-                          <span class="d2h-file-list-title">Files changed (1)</span>
+                <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-hide">hide</a>
-                          <a class="d2h-file-switch d2h-show">show</a>
+                <a class="d2h-file-switch d2h-show">show</a>
-                      </div>
+            </div>
-                      <ol class="d2h-file-list">
+            <ol class="d2h-file-list">
-                      <li class="d2h-file-list-line">
+            <li class="d2h-file-list-line">
-                      <span class="d2h-file-name-wrapper">
+            <span class="d2h-file-name-wrapper">
-                        <svg aria-hidden="true" class="d2h-icon d2h-changed" height="16" title="modified" version="1.1"
+              <svg aria-hidden="true" class="d2h-icon d2h-changed" height="16" title="modified" version="1.1"
-                             viewBox="0 0 14 16" width="14">
+                   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>
+                  <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-675094" class="d2h-file-name">sample</a>
+              </svg>      <a href="#d2h-675094" class="d2h-file-name">sample</a>
-                        <span class="d2h-file-stats">
+              <span class="d2h-file-stats">
-                            <span class="d2h-lines-added">+1</span>
+                  <span class="d2h-lines-added">+1</span>
-                            <span class="d2h-lines-deleted">-1</span>
+                  <span class="d2h-lines-deleted">-1</span>
-                        </span>
+              </span>
-                      </span>
+            </span>
-                  </li>
+        </li>
-                      </ol>
+            </ol>
-                  </div><div class="d2h-wrapper d2h-dark-color-scheme">
+        </div><div class="d2h-wrapper d2h-dark-color-scheme">
-                      <div id="d2h-675094" class="d2h-file-wrapper" data-lang="">
+            <div id="d2h-675094" class="d2h-file-wrapper" data-lang="">
-                      <div class="d2h-file-header">
+            <div class="d2h-file-header">
-                      <span class="d2h-file-name-wrapper">
+            <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">
+            <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>
+                <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>
+            </svg>    <span class="d2h-file-name">sample</span>
-                      <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
+            <span class="d2h-tag d2h-changed d2h-changed-tag">CHANGED</span></span>
-                  <label class="d2h-file-collapse">
+        <label class="d2h-file-collapse">
-                      <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
+            <input class="d2h-file-collapse-input" type="checkbox" name="viewed" value="viewed">
-                      Viewed
+            Viewed
-                  </label>
+        </label>
-                      </div>
+            </div>
-                      <div class="d2h-file-diff">
+            <div class="d2h-file-diff">
-                          <div class="d2h-code-wrapper">
+                <div class="d2h-code-wrapper">
-                              <table class="d2h-diff-table">
+                    <table class="d2h-diff-table">
-                                  <tbody class="d2h-diff-tbody">
+                        <tbody class="d2h-diff-tbody">
-                                  <tr>
+                        <tr>
-                      <td class="d2h-code-linenumber d2h-info"></td>
+            <td class="d2h-code-linenumber d2h-info"></td>
-                      <td class="d2h-info">
+            <td class="d2h-info">
-                          <div class="d2h-code-line">@@ -1 +1 @@</div>
+                <div class="d2h-code-line">@@ -1 +1 @@</div>
-                      </td>
+            </td>
-                  </tr><tr>
+        </tr><tr>
-                      <td class="d2h-code-linenumber d2h-del d2h-change">
+            <td class="d2h-code-linenumber d2h-del d2h-change">
-                        <div class="line-num1">1</div>
+              <div class="line-num1">1</div>
-                  <div class="line-num2"></div>
+        <div class="line-num2"></div>
-                      </td>
+            </td>
-                      <td class="d2h-del d2h-change">
+            <td class="d2h-del d2h-change">
-                          <div class="d2h-code-line">
+                <div class="d2h-code-line">
-                              <span class="d2h-code-line-prefix">-</span>
+                    <span class="d2h-code-line-prefix">-</span>
-                              <span class="d2h-code-line-ctn"><del>test</del></span>
+                    <span class="d2h-code-line-ctn"><del>test</del></span>
-                          </div>
+                </div>
-                      </td>
+            </td>
-                  </tr><tr>
+        </tr><tr>
-                      <td class="d2h-code-linenumber d2h-ins d2h-change">
+            <td class="d2h-code-linenumber d2h-ins d2h-change">
-                        <div class="line-num1"></div>
+              <div class="line-num1"></div>
-                  <div class="line-num2">1</div>
+        <div class="line-num2">1</div>
-                      </td>
+            </td>
-                      <td class="d2h-ins d2h-change">
+            <td class="d2h-ins d2h-change">
-                          <div class="d2h-code-line">
+                <div class="d2h-code-line">
-                              <span class="d2h-code-line-prefix">+</span>
+                    <span class="d2h-code-line-prefix">+</span>
-                              <span class="d2h-code-line-ctn"><ins>test1</ins></span>
+                    <span class="d2h-code-line-ctn"><ins>test1</ins></span>
-                          </div>
+                </div>
-                      </td>
+            </td>
-                  </tr>
+        </tr>
-                                  </tbody>
+                        </tbody>
-                              </table>
+                    </table>
-                          </div>
+                </div>
-                      </div>
+            </div>
-                  </div>
+        </div>
-                  </div>"
+        </div>"
-                `);
+        `);
       });
     });
   });

src/diff-parser.ts

@@ -458,16 +458,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/hoganjs-utils.ts

@@ -39,7 +39,7 @@ export default class HoganJsUtils {
     try {
       const template = this.preCompiledTemplates[templateKey];
       return template.render(params, partials, indent);
-    } catch (_e) {
+    } catch (e) {
       throw new Error(`Could not find template to render '${templateKey}'`);
     }
   }

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

@@ -153,7 +153,8 @@ export class Diff2HtmlUI {
 
       let hljsLanguage =
         language && this.config.highlightLanguages.has(language)
-          ? this.config.highlightLanguages.get(language)!
+          ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            this.config.highlightLanguages.get(language)!
           : language
             ? getLanguage(language)
             : 'plaintext';

tsconfig.eslint.json

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

tsconfig.json

@@ -1,8 +1,8 @@
 {
-  "include": ["src/**/*", "typings/**/*"],
+  "include": ["*env.d.ts", "src/**/*", "./typings/**/*"],
   "exclude": ["node_modules", "src/__tests__/**"],
   "compilerOptions": {
-    "outDir": "bundles-out",
+    "outDir": "lib",
     "module": "CommonJS",
     "moduleResolution": "Node",
     "target": "ES6",

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;
 }

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/demo.ts

@@ -123,16 +123,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,
   };
 
@@ -251,7 +245,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 (
@@ -289,13 +282,13 @@ 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;
+  config.outputFormat && (elements.options.outputFormat.value = config.outputFormat);
-  if (config.colorScheme) elements.options.colorScheme.value = config.colorScheme;
+  config.colorScheme && (elements.options.colorScheme.value = config.colorScheme);
-  if (config.drawFileList) elements.checkboxes.drawFileList.checked = config.drawFileList;
+  config.drawFileList && (elements.checkboxes.drawFileList.checked = config.drawFileList);
-  if (config.matching) elements.options.matching.value = config.matching;
+  config.matching && (elements.options.matching.value = config.matching);
-  if (config.matchWordsThreshold) elements.options.wordsThreshold.value = config.matchWordsThreshold.toString();
+  config.matchWordsThreshold && (elements.options.wordsThreshold.value = config.matchWordsThreshold.toString());
-  if (config.matchingMaxComparisons)
+  config.matchingMaxComparisons &&
-    elements.options.matchingMaxComparisons.value = config.matchingMaxComparisons.toString();
+    (elements.options.matchingMaxComparisons.value = config.matchingMaxComparisons.toString());
 
   Object.entries(elements.options).forEach(([option, element]) =>
     element.addEventListener('change', () => {

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]);