Move javascript folder content in root folder

cucumber · Mar 23, 2022 · 2b1e647 · 2b1e647
1 parent aea0c18
commit 2b1e647
Show file tree

Hide file tree

Showing 73 changed files with 80 additions and 181 deletions.
diff --git a/javascript/.gitignore → .gitignore b/javascript/.gitignore → .gitignore
diff --git a/javascript/.mocharc.json → .mocharc.json b/javascript/.mocharc.json → .mocharc.json
diff --git a/.rsync b/.rsync
@@ -1 +1,3 @@
-../.templates/default.mk default.mk
+../../LICENSE LICENSE
+../../.templates/github/ .github/
+../../.templates/javascript/ .
diff --git a/javascript/.subrepo → .subrepo b/javascript/.subrepo → .subrepo
diff --git a/javascript/Dockerfile → Dockerfile b/javascript/Dockerfile → Dockerfile
diff --git a/javascript/LICENSE → LICENSE b/javascript/LICENSE → LICENSE
diff --git a/Makefile b/Makefile
@@ -1 +1,15 @@
 include default.mk
+
+FEATURE_FILES = $(shell find features -name "*.feature")
+MESSAGES = $(patsubst features/%.feature,features/%.ndjson,$(FEATURE_FILES))
+
+.tested: $(MESSAGES)
+
+clean: clean-messages
+
+clean-messages:
+	rm -rf features/*.ndjson
+
+features/%.ndjson: features/%.feature
+	mkdir -p $(@D)
+	./scripts/fake-cucumber.sh $< > $@
diff --git a/javascript/bin/fake-cucumber → bin/fake-cucumber b/javascript/bin/fake-cucumber → bin/fake-cucumber
diff --git a/default.mk b/default.mk
@@ -1,89 +1,87 @@
-# Please update /.templates/default.mk and sync:
-#
-#     source scripts/functions.sh && rsync_files
-#
 SHELL := /usr/bin/env bash
-ALPINE = $(shell which apk 2> /dev/null)
-LIBNAME = $(shell basename $$(pwd))
-LANGUAGES ?= $(wildcard */)
-
 # https://stackoverflow.com/questions/2483182/recursive-wildcards-in-gnu-make
 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)")
+IS_TESTDATA = $(findstring -testdata,${CURDIR})
+NPM_MODULE = $(shell cat package.json | jq .name --raw-output)
 
-default: $(patsubst %,default-%,$(LANGUAGES))
+default: .tested
 .PHONY: default
 
-default-%: %
-	if [[ -d $< ]]; then cd $< && make default; fi
-.PHONY: default-%
+../../node_modules ../../package-lock.json: package.json
+	cd ../.. && npm install
 
-# Need to declare these phonies to avoid errors for packages without a particular language
-.PHONY: c dotnet go java javascript objective-c perl python ruby
+.codegen:
+	touch $@
 
-update-dependencies: $(patsubst %,update-dependencies-%,$(LANGUAGES))
-.PHONY: update-dependencies
+.tested: .tested-npm .built
+
+.built: $(TYPESCRIPT_SOURCE_FILES) ../../node_modules ../../package-lock.json .codegen
+	pushd ../.. && \
+	npm run build && \
+	popd && \
+	touch $@
+
+.tested-npm: $(TYPESCRIPT_SOURCE_FILES) ../../node_modules ../../package-lock.json .codegen
+	npm run test
+	touch $@
 
-update-dependencies-%: %
-	if [[ -d $< ]]; then cd $< && make update-dependencies; fi
-.PHONY: update-dependencies-%
+pre-release: clean update-version update-dependencies default
+.PHONY: pre-release
+
+update-dependencies: ../../node_modules ../../package-lock.json
+	../../node_modules/.bin/npm-check-updates --upgrade --reject hast-util-sanitize,@types/node,react-markdown,rehype-raw,rehype-sanitize,remark-gfm
+.PHONY: update-dependencies
 
-update-changelog:
+update-version:
+ifeq ($(IS_TESTDATA),-testdata)
+	# no-op
+else
 ifdef NEW_VERSION
-	cat CHANGELOG.md | ../scripts/update_changelog.sh $(NEW_VERSION) > CHANGELOG.md.tmp
-	mv CHANGELOG.md.tmp CHANGELOG.md
+	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)"
 else
 	@echo -e "\033[0;31mNEW_VERSION is not defined. Can't update version :-(\033[0m"
 	exit 1
 endif
-.PHONY: update-changelog
-
-pre-release: update-changelog $(patsubst %,pre-release-%,$(LANGUAGES))
-.PHONY: pre-release
-
-pre-release-%: %
-	if [[ -d $< ]]; then cd $< && make pre-release; fi
-.PHONY: pre-release-%
-
-release: publish
-.PHONY: release
+endif
+.PHONY: update-version
 
-publish: create-and-push-release-tag $(patsubst %,publish-%,$(LANGUAGES))
+publish: .codegen
+ifeq ($(IS_TESTDATA),-testdata)
+	# no-op
+else
+ifneq (true,$(PRIVATE))
+	npm publish --access public
+else
+	@echo "Not publishing private npm module"
+endif
+endif
 .PHONY: publish
 
-publish-%: %
-	if [[ -d $< ]]; then cd $< && make publish; fi
-.PHONY: publish-%
-
-create-and-push-release-tag:
-	[ -f '/home/cukebot/configure' ] && /home/cukebot/configure
-	git commit --gpg-sign --all --message "Release $(LIBNAME) v$(NEW_VERSION)"
-	git tag --sign "$(LIBNAME)/v$(NEW_VERSION)" -m "Release $(LIBNAME) v$(NEW_VERSION)"
-	git push --tags
-.PHONY: create-and-push-release-tag
-
-post-release: $(patsubst %,post-release-%,$(LANGUAGES))
+post-release:
 .PHONY: post-release
 
-post-release: commit-and-push-post-release
+clean: clean-javascript
+.PHONY: clean
 
-post-release-%: %
-	if [[ -d $< ]]; then cd $< && make post-release; fi
-.PHONY: post-release-%
+clean-javascript:
+	rm -rf .deps .codegen .tested* coverage dist acceptance
+.PHONY: clean-javascript
 
-commit-and-push-post-release:
-ifdef NEW_VERSION
-	git push --tags
-	git commit --gpg-sign --all --message "Post release $(LIBNAME) v$(NEW_VERSION)" 2> /dev/null || true
-	git push
-else
-	@echo -e "\033[0;31mNEW_VERSION is not defined.\033[0m"
-	exit 1
-endif
-.PHONY: commit-and-push-post-release
+clobber: clean
+	rm -rf node_modules ../../node_modules
+.PHONY: clobber
 
-clean: $(patsubst %,clean-%,$(LANGUAGES))
-.PHONY: clean
+### COMMON stuff for all platforms
+
+BERP_VERSION = 1.3.0
+BERP_GRAMMAR = gherkin.berp
 
-clean-%: %
-	if [[ -d $< ]]; then cd $< && make clean; fi
-.PHONY: clean-%
+define berp-generate-parser =
+-! dotnet tool list --tool-path /usr/bin | grep "berp\s*$(BERP_VERSION)" && dotnet tool update Berp --version $(BERP_VERSION) --tool-path /usr/bin
+berp -g $(BERP_GRAMMAR) -t $< -o $@ --noBOM
+endef
diff --git a/javascript/features/.gitignore → features/.gitignore b/javascript/features/.gitignore → features/.gitignore
diff --git a/javascript/features/README.md → features/README.md b/javascript/features/README.md → features/README.md
diff --git a/javascript/features/hooks.feature → features/hooks.feature b/javascript/features/hooks.feature → features/hooks.feature
diff --git a/javascript/features/parameter-types.feature → features/parameter-types.feature b/javascript/features/parameter-types.feature → features/parameter-types.feature
diff --git a/javascript/features/supportCode.ts → features/supportCode.ts b/javascript/features/supportCode.ts → features/supportCode.ts
diff --git a/javascript/.github/ISSUE_TEMPLATE.md b/javascript/.github/ISSUE_TEMPLATE.md
diff --git a/javascript/.github/PULL_REQUEST_TEMPLATE.md b/javascript/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/javascript/.rsync b/javascript/.rsync
diff --git a/javascript/Makefile b/javascript/Makefile
diff --git a/javascript/default.mk b/javascript/default.mk
diff --git a/javascript/package.json → package.json b/javascript/package.json → package.json
diff --git a/javascript/scripts/fake-cucumber.sh → scripts/fake-cucumber.sh b/javascript/scripts/fake-cucumber.sh → scripts/fake-cucumber.sh
diff --git a/javascript/src/DataTable.ts → src/DataTable.ts b/javascript/src/DataTable.ts → src/DataTable.ts
diff --git a/javascript/src/DateClock.ts → src/DateClock.ts b/javascript/src/DateClock.ts → src/DateClock.ts
diff --git a/javascript/src/EmptyPickleTestStep.ts → src/EmptyPickleTestStep.ts b/javascript/src/EmptyPickleTestStep.ts → src/EmptyPickleTestStep.ts
diff --git a/javascript/src/ErrorMessageGenerator.ts → src/ErrorMessageGenerator.ts b/javascript/src/ErrorMessageGenerator.ts → src/ErrorMessageGenerator.ts
diff --git a/javascript/src/ExpressionStepDefinition.ts → src/ExpressionStepDefinition.ts b/javascript/src/ExpressionStepDefinition.ts → src/ExpressionStepDefinition.ts
diff --git a/javascript/src/GherkinQueryStream.ts → src/GherkinQueryStream.ts b/javascript/src/GherkinQueryStream.ts → src/GherkinQueryStream.ts
diff --git a/javascript/src/Hook.ts → src/Hook.ts b/javascript/src/Hook.ts → src/Hook.ts
diff --git a/javascript/src/HookTestStep.ts → src/HookTestStep.ts b/javascript/src/HookTestStep.ts → src/HookTestStep.ts
diff --git a/javascript/src/IClock.ts → src/IClock.ts b/javascript/src/IClock.ts → src/IClock.ts
diff --git a/javascript/src/IParameterTypeDefinition.ts → src/IParameterTypeDefinition.ts b/javascript/src/IParameterTypeDefinition.ts → src/IParameterTypeDefinition.ts
diff --git a/javascript/src/IStopwatch.ts → src/IStopwatch.ts b/javascript/src/IStopwatch.ts → src/IStopwatch.ts
diff --git a/javascript/src/IncrementClock.ts → src/IncrementClock.ts b/javascript/src/IncrementClock.ts → src/IncrementClock.ts
diff --git a/javascript/src/IncrementStopwatch.ts → src/IncrementStopwatch.ts b/javascript/src/IncrementStopwatch.ts → src/IncrementStopwatch.ts
diff --git a/javascript/src/PerfHooksStopwatch.ts → src/PerfHooksStopwatch.ts b/javascript/src/PerfHooksStopwatch.ts → src/PerfHooksStopwatch.ts
diff --git a/javascript/src/PickleTestStep.ts → src/PickleTestStep.ts b/javascript/src/PickleTestStep.ts → src/PickleTestStep.ts
diff --git a/javascript/src/SupportCode.ts → src/SupportCode.ts b/javascript/src/SupportCode.ts → src/SupportCode.ts
diff --git a/javascript/src/SupportCodeExecutor.ts → src/SupportCodeExecutor.ts b/javascript/src/SupportCodeExecutor.ts → src/SupportCodeExecutor.ts
diff --git a/javascript/src/TestCase.ts → src/TestCase.ts b/javascript/src/TestCase.ts → src/TestCase.ts
diff --git a/javascript/src/TestPlan.ts → src/TestPlan.ts b/javascript/src/TestPlan.ts → src/TestPlan.ts
diff --git a/javascript/src/TestStep.ts → src/TestStep.ts b/javascript/src/TestStep.ts → src/TestStep.ts
diff --git a/javascript/src/cli.ts → src/cli.ts b/javascript/src/cli.ts → src/cli.ts
diff --git a/javascript/src/dsl.ts → src/dsl.ts b/javascript/src/dsl.ts → src/dsl.ts
diff --git a/javascript/src/findSupportCodePaths.ts → src/findSupportCodePaths.ts b/javascript/src/findSupportCodePaths.ts → src/findSupportCodePaths.ts
diff --git a/javascript/src/global.ts → src/global.ts b/javascript/src/global.ts → src/global.ts
diff --git a/javascript/src/index.ts → src/index.ts b/javascript/src/index.ts → src/index.ts
diff --git a/javascript/src/loadSupportCode.ts → src/loadSupportCode.ts b/javascript/src/loadSupportCode.ts → src/loadSupportCode.ts
diff --git a/javascript/src/makeAttach.ts → src/makeAttach.ts b/javascript/src/makeAttach.ts → src/makeAttach.ts
diff --git a/javascript/src/makeHookTestStep.ts → src/makeHookTestStep.ts b/javascript/src/makeHookTestStep.ts → src/makeHookTestStep.ts
diff --git a/javascript/src/makePickleTestStep.ts → src/makePickleTestStep.ts b/javascript/src/makePickleTestStep.ts → src/makePickleTestStep.ts
diff --git a/javascript/src/makeTestCase.ts → src/makeTestCase.ts b/javascript/src/makeTestCase.ts → src/makeTestCase.ts
diff --git a/javascript/src/makeTestPlan.ts → src/makeTestPlan.ts b/javascript/src/makeTestPlan.ts → src/makeTestPlan.ts
diff --git a/javascript/src/runCucumber.ts → src/runCucumber.ts b/javascript/src/runCucumber.ts → src/runCucumber.ts
diff --git a/javascript/src/types.ts → src/types.ts b/javascript/src/types.ts → src/types.ts
diff --git a/javascript/test/DataTableTest.ts → test/DataTableTest.ts b/javascript/test/DataTableTest.ts → test/DataTableTest.ts
diff --git a/javascript/test/HookTest.ts → test/HookTest.ts b/javascript/test/HookTest.ts → test/HookTest.ts
diff --git a/javascript/test/StepDefinitionTest.ts → test/StepDefinitionTest.ts b/javascript/test/StepDefinitionTest.ts → test/StepDefinitionTest.ts
diff --git a/javascript/test/SupportCodeExecutorTest.ts → test/SupportCodeExecutorTest.ts b/javascript/test/SupportCodeExecutorTest.ts → test/SupportCodeExecutorTest.ts
diff --git a/javascript/test/SupportCodeTest.ts → test/SupportCodeTest.ts b/javascript/test/SupportCodeTest.ts → test/SupportCodeTest.ts
diff --git a/javascript/test/TestCaseTest.ts → test/TestCaseTest.ts b/javascript/test/TestCaseTest.ts → test/TestCaseTest.ts
diff --git a/javascript/test/TestHelpers.ts → test/TestHelpers.ts b/javascript/test/TestHelpers.ts → test/TestHelpers.ts
diff --git a/javascript/test/TestPlanTest.ts → test/TestPlanTest.ts b/javascript/test/TestPlanTest.ts → test/TestPlanTest.ts
diff --git a/javascript/test/TestStepTest.ts → test/TestStepTest.ts b/javascript/test/TestStepTest.ts → test/TestStepTest.ts
diff --git a/javascript/test/TestWorld.ts → test/TestWorld.ts b/javascript/test/TestWorld.ts → test/TestWorld.ts
diff --git a/javascript/test/attachTest.ts → test/attachTest.ts b/javascript/test/attachTest.ts → test/attachTest.ts
diff --git a/javascript/test/cucumber.png → test/cucumber.png b/javascript/test/cucumber.png → test/cucumber.png
diff --git a/javascript/test/findSupportCodePathsTest.ts → test/findSupportCodePathsTest.ts b/javascript/test/findSupportCodePathsTest.ts → test/findSupportCodePathsTest.ts
diff --git a/javascript/test/makeTestCaseTest.ts → test/makeTestCaseTest.ts b/javascript/test/makeTestCaseTest.ts → test/makeTestCaseTest.ts
diff --git a/javascript/test/support/nested/js.js → test/support/nested/js.js b/javascript/test/support/nested/js.js → test/support/nested/js.js
diff --git a/javascript/test/support/nested/ts.ts → test/support/nested/ts.ts b/javascript/test/support/nested/ts.ts → test/support/nested/ts.ts
diff --git a/javascript/test/support/test.feature → test/support/test.feature b/javascript/test/support/test.feature → test/support/test.feature
diff --git a/javascript/tsconfig.build.json → tsconfig.build.json b/javascript/tsconfig.build.json → tsconfig.build.json
diff --git a/javascript/tsconfig.json → tsconfig.json b/javascript/tsconfig.json → tsconfig.json