@cucumber/html-formatter 12.0.0 → 13.0.0

package/.mocharc.json

@@ -1,6 +1,6 @@
 {
-  "require": ["ts-node/register", "source-map-support/register"],
+  "require": ["tsconfig-paths/register", "ts-node/register", "source-map-support/register"],
   "extension": ["ts", "tsx"],
   "recursive": true,
-  "timeout": 10000  
+  "timeout": 10000
 }

package/Makefile

@@ -4,19 +4,18 @@ CCK_NDJSONS = $(shell find ../../compatibility-kit/javascript/features -name "*.
 HTML_REPORTS = $(patsubst ../../compatibility-kit/javascript/features/%.ndjson,acceptance/%.html,$(CCK_NDJSONS))
 HTML_REPORT_CHECKS = $(patsubst acceptance/%.html,acceptance/%.html.checked,$(HTML_REPORTS))
 
-.built: webpack.config.js
-
-ifdef CHECK_INTEGRITY
-# We only check integrity of generated HTML reports when we're making a release.
-# The integrity check only passes when package.json *doesn't* refer to modules
-# using file:..
-#
-# When https://github.com/cucumber/cucumber/issues/1259 is fixed we might
-# be able to check this all the time (including CI)
+.built: webpack.config.js dist/main.js dist/src/index.mustache.html dist/cucumber-react.css
+
+dist/main.js: dist/src/main.js
+	../../node_modules/.bin/webpack-cli
+
+dist/src/index.mustache.html: src/index.mustache.html
+	cp $< $@
+
+dist/cucumber-react.css: ../../node_modules/@cucumber/react/dist/src/styles/cucumber-react.css
+	cp $< $@
+
 .tested: $(HTML_REPORT_CHECKS)
-else
-.tested: $(HTML_REPORTS)
-endif
 
 .PRECIOUS: acceptance/%.html
 acceptance/%.html: ../../compatibility-kit/javascript/features/%.ndjson .built

package/check.js

@@ -1,17 +1,17 @@
 const fs = require('fs')
 const path = process.argv[2]
 const html = fs.readFileSync(path, 'utf-8')
-const puppeteer = require('puppeteer');
+const puppeteer = require('puppeteer')
 
 async function check() {
-  const browser = await puppeteer.launch();
-  const page = await browser.newPage();
+  const browser = await puppeteer.launch({ headless: true, args: ['--no-sandbox'] })
+  const page = await browser.newPage()
   await page.setContent(html)
   const dynamicHTML = await page.evaluate(() => {
     const content = document.querySelector('.cucumber-react')
     return content && content.innerHTML
-  });
-  await browser.close();
+  })
+  await browser.close()
 
   if(!dynamicHTML) throw new Error(`The file ${path} did not render a .cucumber-react element. Inspect manually.`)
 }

package/default.mk

@@ -3,64 +3,42 @@ SHELL := /usr/bin/env bash
 rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
 TYPESCRIPT_SOURCE_FILES = $(sort $(call rwildcard,src test,*.ts *.tsx))
 PRIVATE = $(shell node -e "console.log(require('./package.json').private)")
-NPM ?= npm
 IS_TESTDATA = $(findstring -testdata,${CURDIR})
+NPM_MODULE = $(shell cat package.json | jq .name --raw-output)
 
-ifeq (yarn,$(NPM))
-LOCKFILE = yarn.lock
-else
-LOCKFILE = package-lock.json
-endif
-
-default: .tested .built .linted
+default: .tested
 .PHONY: default
 
-.deps: $(LOCKFILE)
-	touch $@
-
-.codegen: .deps
-	touch $@
-
-.built: .codegen $(TYPESCRIPT_SOURCE_FILES)
-	$(NPM) run build
+.codegen:
 	touch $@
 
 .tested: .tested-npm
 
-.tested-npm: .built $(TYPESCRIPT_SOURCE_FILES)
-	TS_NODE_TRANSPILE_ONLY=1 $(NPM) run test
-	touch $@
-
-.linted: $(TYPESCRIPT_SOURCE_FILES) .built
-	$(NPM) run lint-fix
+.tested-npm: $(TYPESCRIPT_SOURCE_FILES) .codegen
+	npm run test
 	touch $@
 
-$(LOCKFILE): package.json
-	$(NPM) install
-	touch $@
+pre-release: clean update-version update-dependencies default
+.PHONY: pre-release
 
 update-dependencies:
-	npx npm-check-updates --upgrade
+	../../node_modules/.bin/npm-check-updates --upgrade && \
+	pushd ../.. && \
+	npm install && \
+	npm run build && \
+	popd
 .PHONY: update-dependencies
 
-remove-local-dependencies:
-ifeq ($(IS_TESTDATA),-testdata)
-	# no-op
-else
-	cat package.json | sed 's/"@cucumber\/\(.*\)": "file:..\/..\/.*"/"@cucumber\/\1": "^0.0.0"/' > package.json.tmp
-	mv package.json.tmp package.json
-endif
-.PHONY: remove-local-dependencies
-
-pre-release: remove-local-dependencies update-version update-dependencies clean default
-.PHONY: pre-release
-
 update-version:
 ifeq ($(IS_TESTDATA),-testdata)
 	# no-op
 else
 ifdef NEW_VERSION
-	$(NPM) --no-git-tag-version --allow-same-version version "$(NEW_VERSION)"
+	npm --no-git-tag-version --allow-same-version version "$(NEW_VERSION)"
+	# Update all npm packages that depend on us
+	pushd ../.. && \
+		./scripts/npm-each update_npm_dependency_if_exists package.json "$(NPM_MODULE)" "^$(NEW_VERSION)"
+		# npm install
 else
 	@echo -e "\033[0;31mNEW_VERSION is not defined. Can't update version :-(\033[0m"
 	exit 1
@@ -73,7 +51,7 @@ ifeq ($(IS_TESTDATA),-testdata)
 	# no-op
 else
 ifneq (true,$(PRIVATE))
-	$(NPM) publish --access public
+	npm publish --access public
 else
 	@echo "Not publishing private npm module"
 endif
@@ -81,17 +59,11 @@ endif
 .PHONY: publish
 
 post-release:
-ifeq ($(IS_TESTDATA),-testdata)
-	# no-op
-else
-	cat package.json | sed 's/"@cucumber\/\(.*\)": .*"/"@cucumber\/\1": "file:..\/..\/\1\/javascript"/' > package.json.tmp
-	mv package.json.tmp package.json
-endif
 .PHONY: post-release
 
 clean: clean-javascript
 .PHONY: clean
 
 clean-javascript:
-	rm -rf .deps .codegen .built* .tested* .linted package-lock.json yarn.lock node_modules coverage dist acceptance
+	rm -rf .deps .codegen .tested* node_modules coverage dist acceptance
 .PHONY: clean-javascript