@cucumber/html-formatter 11.0.2 → 13.0.0

package/logo.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="ml-3 ml-md-0" viewBox="0 0 40.59 46.31" width="40.59" height="46.31">
+    <g>
+        <path fill="#23d96c" fill-rule="evenodd" d="M30.283 3.645q-.528-.317-1.08-.593a16.164 16.164 0 00-1.154-.518c-.124-.052-.247-.1-.372-.149-.343-.127-.689-.268-1.042-.371a19.427 19.427 0 10-9.792 37.51v5.56c11.676-1.753 22.016-10.979 22.787-23.093.459-7.289-3.193-14.73-9.347-18.346z"/>
+        <path fill="#173647" d="M15.787 46.307v-5.935A20.472 20.472 0 1126.959 1.015c.274.08.557.187.832.291l.248.093c.165.064.291.113.417.167.348.137.739.313 1.208.543q.589.295 1.153.633c6.393 3.756 10.354 11.518 9.857 19.316-.763 12-10.722 22.122-23.679 24.067zm4.8-44.214h-.026a18.366 18.366 0 00-3.524 36.408l.85.165v5.18c11.392-2.224 20.009-11.272 20.686-21.922.448-7.033-3.1-14.018-8.83-17.383l-.008-.005A14.691 14.691 0 0027.654 3.5a5.74 5.74 0 00-.344-.138l-.27-.1a9.49 9.49 0 00-.708-.249 18.425 18.425 0 00-5.743-.92z"/>
+        <path fill="#173647" fill-rule="evenodd" d="M16.666 10.58a1.8 1.8 0 011.583.608 4.184 4.184 0 01.728 1.107c.645 1.422 1.027 3.461.23 4.605a6.334 6.334 0 01-3.981-3.087 3.236 3.236 0 01-.347-1.339 1.957 1.957 0 011.787-1.894zm-5.683 8.025a7.742 7.742 0 001.218.737 5.789 5.789 0 004.883-.138 6.116 6.116 0 00-3.345-3.45 3.664 3.664 0 00-1.442-.321 1.884 1.884 0 00-.319 0 1.766 1.766 0 00-.995 3.172zm6.1 3.433c-.777-.518-2.379-.309-3.312-.292a4.416 4.416 0 00-1.666.352 3.5 3.5 0 00-1.218.738 1.817 1.817 0 001.409 3.171 3.3 3.3 0 001.442-.321c1.436-.62 3.141-2.32 3.346-3.648zm2.61 2a6.556 6.556 0 00-3.724 3.506 3.091 3.091 0 00-.321 1.314 1.907 1.907 0 003.3 1.346 7.422 7.422 0 00.7-1.218c.621-1.333.866-3.72.046-4.948zm2.557-7.167a5.941 5.941 0 003.7-3.167 3.243 3.243 0 00.319-1.346 1.915 1.915 0 00-1.794-1.954 1.832 1.832 0 00-1.6.641 7.382 7.382 0 00-.705 1.218c-.62 1.434-.842 3.48.081 4.603zm4.208 12.115a3.244 3.244 0 00-.321-1.345 5.869 5.869 0 00-3.554-3.269 5.386 5.386 0 00-.226 4.711 4.147 4.147 0 00.7 1.121c1.133 1.23 3.505.32 3.402-1.218zm4.2-6.28a7.466 7.466 0 00-1.217-.7 4.425 4.425 0 00-1.666-.352 6.4 6.4 0 00-3.188.555 5.959 5.959 0 003.316 3.386 3.672 3.672 0 001.442.32 1.8 1.8 0 001.31-3.209z"/>
+    </g>
+</svg>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cucumber/html-formatter",
-  "version": "11.0.2",
+  "version": "13.0.0",
   "description": "HTML formatter for Cucumber",
   "bin": {
     "cucumber-html-formatter": "bin/cucumber-html-formatter.js"
@@ -14,48 +14,35 @@
   "author": "Aslak Hellesøy",
   "license": "MIT",
   "scripts": {
-    "nyc": "nyc --reporter=html --reporter=text mocha",
     "test": "mocha",
-    "lint": "eslint --ext ts,tsx --max-warnings 0 src test",
-    "lint-fix": "eslint --ext ts,tsx --max-warnings 0 --fix src test",
-    "build": "tsc && webpack-cli && cp src/index.mustache.html dist/src"
+    "prepublishOnly": "tsc --build tsconfig.build.json"
   },
   "dependencies": {
-    "@cucumber/gherkin-utils": "^2.1.1",
-    "@cucumber/messages": "^13.2.1",
-    "@cucumber/query": "^7.0.1",
-    "@cucumber/react": "^11.0.2",
-    "commander": "^6.2.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "resolve-pkg": "^2.0.0",
+    "@cucumber/messages": "^15.0.0",
+    "commander": "^7.2.0",
     "source-map-support": "^0.5.19"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@types/jsdom": "^16.2.5",
-    "@types/mocha": "^8.2.0",
-    "@types/node": "^14.14.14",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.10.0",
-    "@typescript-eslint/parser": "^4.10.0",
+    "@babel/core": "^7.13.14",
+    "@cucumber/gherkin-utils": "^4.0.0",
+    "@cucumber/query": "^9.0.2",
+    "@cucumber/react": "^13.0.0",
+    "@cucumber/gherkin-streams": "^1.0.0",
+    "@cucumber/message-streams": "^1.0.0",
+    "@types/mocha": "^8.2.2",
+    "@types/node": "^14.14.37",
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.3",
     "babel-loader": "^8.2.2",
-    "eslint": "^7.15.0",
-    "eslint-config-prettier": "^7.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-prettier": "^3.3.0",
-    "eslint-plugin-react": "^7.21.5",
-    "gherkin": "^9.0.0",
-    "mocha": "^8.2.1",
-    "npm-link-shared": "^0.5.6",
-    "nyc": "^15.1.0",
-    "prettier": "^2.2.1",
-    "ts-loader": "^8.0.12",
+    "mocha": "^8.3.2",
+    "puppeteer": "^8.0.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "ts-loader": "^8.1.0",
     "ts-node": "^9.1.1",
-    "typescript": "^4.1.3",
-    "webpack": "^5.11.0",
-    "webpack-cli": "^4.2.0"
+    "typescript": "^4.2.3",
+    "webpack": "^5.30.0",
+    "webpack-cli": "^4.6.0"
   },
   "bugs": {
     "url": "https://github.com/cucumber/cucumber/issues"

package/src/CucumberHtmlStream.ts

@@ -11,10 +11,8 @@ export default class CucumberHtmlStream extends Transform {
    * @param cssPath
    * @param jsPath
    */
-  constructor(cssPath: string, jsPath: string) {
+  constructor(private readonly cssPath: string, private readonly jsPath: string) {
     super({ objectMode: true })
-    this.cssPath = cssPath
-    this.jsPath = jsPath
   }
 
   public _transform(
@@ -37,8 +35,6 @@ export default class CucumberHtmlStream extends Transform {
     this.writePostMessage(callback)
   }
 
-  private cssPath: string
-
   private writePreMessageUnlessAlreadyWritten(callback: TransformCallback) {
     if (this.preMessageWritten) {
       return callback()
@@ -57,8 +53,6 @@ export default class CucumberHtmlStream extends Transform {
     })
   }
 
-  private jsPath: string
-
   private writePostMessage(callback: TransformCallback) {
     this.writePreMessageUnlessAlreadyWritten((err) => {
       if (err) return callback(err)
@@ -86,29 +80,22 @@ export default class CucumberHtmlStream extends Transform {
   ) {
     this.readTemplate((err, template) => {
       if (err) return callback(err)
-      const beginIndex =
-        begin == null ? 0 : template.indexOf(begin) + begin.length
+      const beginIndex = begin == null ? 0 : template.indexOf(begin) + begin.length
       const endIndex = end == null ? template.length : template.indexOf(end)
       this.push(template.substring(beginIndex, endIndex))
       callback()
     })
   }
 
-  private readTemplate(
-    callback: (error?: Error | null, data?: string) => void
-  ) {
+  private readTemplate(callback: (error?: Error | null, data?: string) => void) {
     if (this.template !== null) {
       return callback(null, this.template)
     }
-    fs.readFile(
-      __dirname + '/index.mustache.html',
-      { encoding: 'utf-8' },
-      (err, template) => {
-        if (err) return callback(err)
-        this.template = template
-        return callback(null, template)
-      }
-    )
+    fs.readFile(__dirname + '/index.mustache.html', { encoding: 'utf-8' }, (err, template) => {
+      if (err) return callback(err)
+      this.template = template
+      return callback(null, template)
+    })
   }
 
   private writeMessage(envelope: messages.Envelope) {

package/src/cli-main.ts

@@ -1,37 +1,24 @@
-import {
-  BinaryToMessageStream,
-  messages,
-  NdjsonToMessageStream,
-} from '@cucumber/messages'
+import { messages } from '@cucumber/messages'
+import { BinaryToMessageStream, NdjsonToMessageStream } from '@cucumber/message-streams'
 import program from 'commander'
 import p from '../package.json'
-import resolvePkg from 'resolve-pkg'
 import { pipeline } from 'stream'
 import CucumberHtmlStream from './CucumberHtmlStream'
 
 program.version(p.version)
-program.option(
-  '-f, --format <format>',
-  'output format: ndjson|protobuf',
-  'protobuf'
-)
+program.option('-f, --format <format>', 'output format: ndjson|protobuf', 'protobuf')
 program.parse(process.argv)
 
 const toMessageStream =
-  program.format === 'ndjson'
-    ? new NdjsonToMessageStream(
-        messages.Envelope.fromObject.bind(messages.Envelope)
-      )
-    : new BinaryToMessageStream(
-        messages.Envelope.decodeDelimited.bind(messages.Envelope)
-      )
+  program.opts().format === 'ndjson'
+    ? new NdjsonToMessageStream(messages.Envelope.fromObject.bind(messages.Envelope))
+    : new BinaryToMessageStream(messages.Envelope.decodeDelimited.bind(messages.Envelope))
 
 pipeline(
   process.stdin,
   toMessageStream,
   new CucumberHtmlStream(
-    resolvePkg('@cucumber/react', { cwd: __dirname }) +
-      '/dist/src/styles/cucumber-react.css',
+    __dirname + '/../../dist/cucumber-react.css',
     __dirname + '/../../dist/main.js'
   ),
   process.stdout,

package/src/index.mustache.html

@@ -3,6 +3,7 @@
 <head>
 	<title>Cucumber</title>
 	<meta content="text/html;charset=utf-8" http-equiv="Content-Type">
+	<link rel="icon" href="data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20class%3D%22ml-3%20ml-md-0%22%20viewBox%3D%220%200%2040.59%2046.31%22%20width%3D%2240.59%22%20height%3D%2246.31%22%3E%0A%20%20%20%20%3Cg%3E%0A%20%20%20%20%20%20%20%20%3Cpath%20fill%3D%22%2323d96c%22%20fill-rule%3D%22evenodd%22%20d%3D%22M30.283%203.645q-.528-.317-1.08-.593a16.164%2016.164%200%2000-1.154-.518c-.124-.052-.247-.1-.372-.149-.343-.127-.689-.268-1.042-.371a19.427%2019.427%200%2010-9.792%2037.51v5.56c11.676-1.753%2022.016-10.979%2022.787-23.093.459-7.289-3.193-14.73-9.347-18.346z%22%2F%3E%0A%20%20%20%20%20%20%20%20%3Cpath%20fill%3D%22%23173647%22%20d%3D%22M15.787%2046.307v-5.935A20.472%2020.472%200%201126.959%201.015c.274.08.557.187.832.291l.248.093c.165.064.291.113.417.167.348.137.739.313%201.208.543q.589.295%201.153.633c6.393%203.756%2010.354%2011.518%209.857%2019.316-.763%2012-10.722%2022.122-23.679%2024.067zm4.8-44.214h-.026a18.366%2018.366%200%2000-3.524%2036.408l.85.165v5.18c11.392-2.224%2020.009-11.272%2020.686-21.922.448-7.033-3.1-14.018-8.83-17.383l-.008-.005A14.691%2014.691%200%200027.654%203.5a5.74%205.74%200%2000-.344-.138l-.27-.1a9.49%209.49%200%2000-.708-.249%2018.425%2018.425%200%2000-5.743-.92z%22%2F%3E%0A%20%20%20%20%20%20%20%20%3Cpath%20fill%3D%22%23173647%22%20fill-rule%3D%22evenodd%22%20d%3D%22M16.666%2010.58a1.8%201.8%200%20011.583.608%204.184%204.184%200%2001.728%201.107c.645%201.422%201.027%203.461.23%204.605a6.334%206.334%200%2001-3.981-3.087%203.236%203.236%200%2001-.347-1.339%201.957%201.957%200%20011.787-1.894zm-5.683%208.025a7.742%207.742%200%20001.218.737%205.789%205.789%200%20004.883-.138%206.116%206.116%200%2000-3.345-3.45%203.664%203.664%200%2000-1.442-.321%201.884%201.884%200%2000-.319%200%201.766%201.766%200%2000-.995%203.172zm6.1%203.433c-.777-.518-2.379-.309-3.312-.292a4.416%204.416%200%2000-1.666.352%203.5%203.5%200%2000-1.218.738%201.817%201.817%200%20001.409%203.171%203.3%203.3%200%20001.442-.321c1.436-.62%203.141-2.32%203.346-3.648zm2.61%202a6.556%206.556%200%2000-3.724%203.506%203.091%203.091%200%2000-.321%201.314%201.907%201.907%200%20003.3%201.346%207.422%207.422%200%2000.7-1.218c.621-1.333.866-3.72.046-4.948zm2.557-7.167a5.941%205.941%200%20003.7-3.167%203.243%203.243%200%2000.319-1.346%201.915%201.915%200%2000-1.794-1.954%201.832%201.832%200%2000-1.6.641%207.382%207.382%200%2000-.705%201.218c-.62%201.434-.842%203.48.081%204.603zm4.208%2012.115a3.244%203.244%200%2000-.321-1.345%205.869%205.869%200%2000-3.554-3.269%205.386%205.386%200%2000-.226%204.711%204.147%204.147%200%2000.7%201.121c1.133%201.23%203.505.32%203.402-1.218zm4.2-6.28a7.466%207.466%200%2000-1.217-.7%204.425%204.425%200%2000-1.666-.352%206.4%206.4%200%2000-3.188.555%205.959%205.959%200%20003.316%203.386%203.672%203.672%200%20001.442.32%201.8%201.8%200%20001.31-3.209z%22%2F%3E%0A%20%20%20%20%3C%2Fg%3E%0A%3C%2Fsvg%3E">
 	<style>
 {{css}}
 	</style>

package/src/main.tsx

@@ -1,9 +1,5 @@
 import { messages } from '@cucumber/messages'
-import {
-  QueriesWrapper,
-  EnvelopesQuery,
-  FilteredResults,
-} from '@cucumber/react'
+import { QueriesWrapper, EnvelopesQuery, FilteredResults } from '@cucumber/react'
 import { Query as GherkinQuery } from '@cucumber/gherkin-utils'
 import { Query as CucumberQuery } from '@cucumber/query'
 import React from 'react'

package/test/CucumberHtmlStreamTest.ts

@@ -3,27 +3,21 @@ import CucumberHtmlStream from '../src/CucumberHtmlStream'
 import { Writable } from 'stream'
 import assert from 'assert'
 
-async function renderAsHtml(
-  ...envelopes: messages.IEnvelope[]
-): Promise<string> {
-  return new Promise((resolve) => {
+async function renderAsHtml(...envelopes: messages.IEnvelope[]): Promise<string> {
+  return new Promise((resolve, reject) => {
     let html = ''
     const sink: Writable = new Writable({
-      write(
-        chunk: any,
-        encoding: string,
-        callback: (error?: Error | null) => void
-      ): void {
+      write(chunk: any, encoding: string, callback: (error?: Error | null) => void): void {
         html += chunk
         callback()
       },
     })
     sink.on('finish', () => resolve(html))
     const cucumberHtmlStream = new CucumberHtmlStream(
-      __dirname +
-        '/../node_modules/@cucumber/react/dist/src/styles/cucumber-react.css',
-      __dirname + '/../dist/main.js'
+      `${__dirname}/dummy.css`,
+      `${__dirname}/dummy.js`
     )
+    cucumberHtmlStream.on('error', reject)
     cucumberHtmlStream.pipe(sink)
 
     for (const envelope of envelopes) {
@@ -44,14 +38,10 @@ describe('CucumberHtmlStream', () => {
       testRunStarted: messages.TestRunStarted.create({}),
     })
     const html = await renderAsHtml(e1)
-    assert(
-      html.indexOf(
-        `window.CUCUMBER_MESSAGES = [${JSON.stringify(e1.toJSON())}]`
-      ) >= 0
-    )
+    assert(html.indexOf(`window.CUCUMBER_MESSAGES = [${JSON.stringify(e1.toJSON())}]`) >= 0)
   })
 
-  it('writes one message to html', async () => {
+  it('writes two messages to html', async () => {
     const e1 = messages.Envelope.create({
       testRunStarted: messages.TestRunStarted.create({}),
     })
@@ -61,9 +51,7 @@ describe('CucumberHtmlStream', () => {
     const html = await renderAsHtml(e1, e2)
     assert(
       html.indexOf(
-        `window.CUCUMBER_MESSAGES = [${JSON.stringify(
-          e1.toJSON()
-        )},${JSON.stringify(e2.toJSON())}]`
+        `window.CUCUMBER_MESSAGES = [${JSON.stringify(e1.toJSON())},${JSON.stringify(e2.toJSON())}]`
       ) >= 0
     )
   })

package/tsconfig.build.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "rootDir": ".",
+    "outDir": "dist"
+  },
+  "include": [
+    "src",
+    "test",
+    "features",
+    "package.json"
+  ]
+}

package/tsconfig.json

@@ -1,26 +1,3 @@
 {
-  "compilerOptions": {
-    "declaration": true,
-    "target": "es5",
-    "lib": [
-      "es2019",
-      "dom"
-    ],
-    "sourceMap": true,
-    "allowJs": false,
-    "jsx": "react",
-    "resolveJsonModule": true,
-    "module": "commonjs",
-    "esModuleInterop": true,
-    "noImplicitAny": true,
-    "moduleResolution": "node",
-    "outDir": "dist",
-    "downlevelIteration": true,
-    "skipLibCheck": true
-  },
-  "include": [
-    "src/**/*",
-    "test/**/*",
-    "features/**/*"
-  ]
+  "extends": "../../tsconfig.json"
 }

package/webpack.config.js

@@ -1,19 +1,3 @@
-const path = require('path')
-
 module.exports = {
-  entry: './src/main.tsx',
-  module: {
-    rules: [
-      {test: /\.tsx?$/, use: 'ts-loader'}
-    ]
-  },
-  resolve: {
-    fallback: {
-      stream: false,
-      path: false
-    },
-    alias: {
-      react: path.resolve('./node_modules/react')
-    }
-  }
+  entry: './dist/src/main.js',
 };

package/.eslintrc.json

@@ -1,41 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "node": true
-  },
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "project": "tsconfig.json",
-    "sourceType": "module"
-  },
-  "plugins": [
-    "react",
-    "node",
-    "@typescript-eslint"
-  ],
-  "extends": [
-    "eslint:recommended",
-    "plugin:react/recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:prettier/recommended"
-  ],
-  "rules": {
-    "node/no-extraneous-import": "error",
-    "@typescript-eslint/ban-ts-ignore": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/no-use-before-define": "off",
-    "@typescript-eslint/interface-name-prefix": "off",
-    "@typescript-eslint/member-delimiter-style": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-    "react/prop-types": "off"
-  },
-  "settings": {
-    "react": {
-      "pragma": "React",
-      "version": "detect"
-    }
-  }
-}

package/.nycrc.json

@@ -1,16 +0,0 @@
-{
-  "extension": [
-    ".ts",
-    ".tsx"
-  ],
-  "exclude": [
-    "coverage",
-    "dist",
-    "src/**/*.d.ts"
-  ],
-  "reporter": [
-    "html",
-    "text"
-  ],
-  "all": true  
-}

package/.prettierrc

@@ -1,5 +0,0 @@
-{
-  "trailingComma": "es5",
-  "semi": false,
-  "singleQuote": true
-}