From 2b1e647bb132eb4c703861e83ad8a5fc2e4b5dce Mon Sep 17 00:00:00 2001 From: aurelien-reeves Date: Wed, 23 Mar 2022 17:39:54 +0100 Subject: [PATCH] Move javascript folder content in root folder --- javascript/.gitignore => .gitignore | 0 javascript/.mocharc.json => .mocharc.json | 0 .rsync | 4 +- javascript/.subrepo => .subrepo | 0 javascript/Dockerfile => Dockerfile | 0 javascript/LICENSE => LICENSE | 0 Makefile | 14 ++ {javascript/bin => bin}/fake-cucumber | 0 default.mk | 128 +++++++++--------- {javascript/features => features}/.gitignore | 0 {javascript/features => features}/README.md | 0 .../features => features}/hooks.feature | 0 .../parameter-types.feature | 0 .../features => features}/supportCode.ts | 0 javascript/.github/ISSUE_TEMPLATE.md | 5 - javascript/.github/PULL_REQUEST_TEMPLATE.md | 5 - javascript/.rsync | 3 - javascript/Makefile | 15 -- javascript/default.mk | 87 ------------ javascript/package.json => package.json | 0 .../scripts => scripts}/fake-cucumber.sh | 0 {javascript/src => src}/DataTable.ts | 0 {javascript/src => src}/DateClock.ts | 0 .../src => src}/EmptyPickleTestStep.ts | 0 .../src => src}/ErrorMessageGenerator.ts | 0 .../src => src}/ExpressionStepDefinition.ts | 0 {javascript/src => src}/GherkinQueryStream.ts | 0 {javascript/src => src}/Hook.ts | 0 {javascript/src => src}/HookTestStep.ts | 0 {javascript/src => src}/IClock.ts | 0 .../src => src}/IParameterTypeDefinition.ts | 0 {javascript/src => src}/IStopwatch.ts | 0 {javascript/src => src}/IncrementClock.ts | 0 {javascript/src => src}/IncrementStopwatch.ts | 0 {javascript/src => src}/PerfHooksStopwatch.ts | 0 {javascript/src => src}/PickleTestStep.ts | 0 {javascript/src => src}/SupportCode.ts | 0 .../src => src}/SupportCodeExecutor.ts | 0 {javascript/src => src}/TestCase.ts | 0 {javascript/src => src}/TestPlan.ts | 0 {javascript/src => src}/TestStep.ts | 0 {javascript/src => src}/cli.ts | 0 {javascript/src => src}/dsl.ts | 0 .../src => src}/findSupportCodePaths.ts | 0 {javascript/src => src}/global.ts | 0 {javascript/src => src}/index.ts | 0 {javascript/src => src}/loadSupportCode.ts | 0 {javascript/src => src}/makeAttach.ts | 0 {javascript/src => src}/makeHookTestStep.ts | 0 {javascript/src => src}/makePickleTestStep.ts | 0 {javascript/src => src}/makeTestCase.ts | 0 {javascript/src => src}/makeTestPlan.ts | 0 {javascript/src => src}/runCucumber.ts | 0 {javascript/src => src}/types.ts | 0 {javascript/test => test}/DataTableTest.ts | 0 {javascript/test => test}/HookTest.ts | 0 .../test => test}/StepDefinitionTest.ts | 0 .../test => test}/SupportCodeExecutorTest.ts | 0 {javascript/test => test}/SupportCodeTest.ts | 0 {javascript/test => test}/TestCaseTest.ts | 0 {javascript/test => test}/TestHelpers.ts | 0 {javascript/test => test}/TestPlanTest.ts | 0 {javascript/test => test}/TestStepTest.ts | 0 {javascript/test => test}/TestWorld.ts | 0 {javascript/test => test}/attachTest.ts | 0 {javascript/test => test}/cucumber.png | Bin .../test => test}/findSupportCodePathsTest.ts | 0 {javascript/test => test}/makeTestCaseTest.ts | 0 .../test => test}/support/nested/js.js | 0 .../test => test}/support/nested/ts.ts | 0 .../test => test}/support/test.feature | 0 ...tsconfig.build.json => tsconfig.build.json | 0 javascript/tsconfig.json => tsconfig.json | 0 73 files changed, 80 insertions(+), 181 deletions(-) rename javascript/.gitignore => .gitignore (100%) rename javascript/.mocharc.json => .mocharc.json (100%) rename javascript/.subrepo => .subrepo (100%) rename javascript/Dockerfile => Dockerfile (100%) rename javascript/LICENSE => LICENSE (100%) rename {javascript/bin => bin}/fake-cucumber (100%) rename {javascript/features => features}/.gitignore (100%) rename {javascript/features => features}/README.md (100%) rename {javascript/features => features}/hooks.feature (100%) rename {javascript/features => features}/parameter-types.feature (100%) rename {javascript/features => features}/supportCode.ts (100%) delete mode 100644 javascript/.github/ISSUE_TEMPLATE.md delete mode 100644 javascript/.github/PULL_REQUEST_TEMPLATE.md delete mode 100644 javascript/.rsync delete mode 100644 javascript/Makefile delete mode 100644 javascript/default.mk rename javascript/package.json => package.json (100%) rename {javascript/scripts => scripts}/fake-cucumber.sh (100%) rename {javascript/src => src}/DataTable.ts (100%) rename {javascript/src => src}/DateClock.ts (100%) rename {javascript/src => src}/EmptyPickleTestStep.ts (100%) rename {javascript/src => src}/ErrorMessageGenerator.ts (100%) rename {javascript/src => src}/ExpressionStepDefinition.ts (100%) rename {javascript/src => src}/GherkinQueryStream.ts (100%) rename {javascript/src => src}/Hook.ts (100%) rename {javascript/src => src}/HookTestStep.ts (100%) rename {javascript/src => src}/IClock.ts (100%) rename {javascript/src => src}/IParameterTypeDefinition.ts (100%) rename {javascript/src => src}/IStopwatch.ts (100%) rename {javascript/src => src}/IncrementClock.ts (100%) rename {javascript/src => src}/IncrementStopwatch.ts (100%) rename {javascript/src => src}/PerfHooksStopwatch.ts (100%) rename {javascript/src => src}/PickleTestStep.ts (100%) rename {javascript/src => src}/SupportCode.ts (100%) rename {javascript/src => src}/SupportCodeExecutor.ts (100%) rename {javascript/src => src}/TestCase.ts (100%) rename {javascript/src => src}/TestPlan.ts (100%) rename {javascript/src => src}/TestStep.ts (100%) rename {javascript/src => src}/cli.ts (100%) rename {javascript/src => src}/dsl.ts (100%) rename {javascript/src => src}/findSupportCodePaths.ts (100%) rename {javascript/src => src}/global.ts (100%) rename {javascript/src => src}/index.ts (100%) rename {javascript/src => src}/loadSupportCode.ts (100%) rename {javascript/src => src}/makeAttach.ts (100%) rename {javascript/src => src}/makeHookTestStep.ts (100%) rename {javascript/src => src}/makePickleTestStep.ts (100%) rename {javascript/src => src}/makeTestCase.ts (100%) rename {javascript/src => src}/makeTestPlan.ts (100%) rename {javascript/src => src}/runCucumber.ts (100%) rename {javascript/src => src}/types.ts (100%) rename {javascript/test => test}/DataTableTest.ts (100%) rename {javascript/test => test}/HookTest.ts (100%) rename {javascript/test => test}/StepDefinitionTest.ts (100%) rename {javascript/test => test}/SupportCodeExecutorTest.ts (100%) rename {javascript/test => test}/SupportCodeTest.ts (100%) rename {javascript/test => test}/TestCaseTest.ts (100%) rename {javascript/test => test}/TestHelpers.ts (100%) rename {javascript/test => test}/TestPlanTest.ts (100%) rename {javascript/test => test}/TestStepTest.ts (100%) rename {javascript/test => test}/TestWorld.ts (100%) rename {javascript/test => test}/attachTest.ts (100%) rename {javascript/test => test}/cucumber.png (100%) rename {javascript/test => test}/findSupportCodePathsTest.ts (100%) rename {javascript/test => test}/makeTestCaseTest.ts (100%) rename {javascript/test => test}/support/nested/js.js (100%) rename {javascript/test => test}/support/nested/ts.ts (100%) rename {javascript/test => test}/support/test.feature (100%) rename javascript/tsconfig.build.json => tsconfig.build.json (100%) rename javascript/tsconfig.json => tsconfig.json (100%) diff --git a/javascript/.gitignore b/.gitignore similarity index 100% rename from javascript/.gitignore rename to .gitignore diff --git a/javascript/.mocharc.json b/.mocharc.json similarity index 100% rename from javascript/.mocharc.json rename to .mocharc.json diff --git a/.rsync b/.rsync index ea5a5de2..2672e9f3 100644 --- a/.rsync +++ b/.rsync @@ -1 +1,3 @@ -../.templates/default.mk default.mk +../../LICENSE LICENSE +../../.templates/github/ .github/ +../../.templates/javascript/ . diff --git a/javascript/.subrepo b/.subrepo similarity index 100% rename from javascript/.subrepo rename to .subrepo diff --git a/javascript/Dockerfile b/Dockerfile similarity index 100% rename from javascript/Dockerfile rename to Dockerfile diff --git a/javascript/LICENSE b/LICENSE similarity index 100% rename from javascript/LICENSE rename to LICENSE diff --git a/Makefile b/Makefile index 551e68e2..432630b3 100644 --- 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 b/bin/fake-cucumber similarity index 100% rename from javascript/bin/fake-cucumber rename to bin/fake-cucumber diff --git a/default.mk b/default.mk index a0d8dd28..b04d59c4 100644 --- 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 b/features/.gitignore similarity index 100% rename from javascript/features/.gitignore rename to features/.gitignore diff --git a/javascript/features/README.md b/features/README.md similarity index 100% rename from javascript/features/README.md rename to features/README.md diff --git a/javascript/features/hooks.feature b/features/hooks.feature similarity index 100% rename from javascript/features/hooks.feature rename to features/hooks.feature diff --git a/javascript/features/parameter-types.feature b/features/parameter-types.feature similarity index 100% rename from javascript/features/parameter-types.feature rename to features/parameter-types.feature diff --git a/javascript/features/supportCode.ts b/features/supportCode.ts similarity index 100% rename from javascript/features/supportCode.ts rename to features/supportCode.ts diff --git a/javascript/.github/ISSUE_TEMPLATE.md b/javascript/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index fac96198..00000000 --- a/javascript/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,5 +0,0 @@ -PLEASE DO NOT CREATE ISSUES IN THIS REPO. -THIS REPO IS A READ-ONLY MIRROR. - -Create your issue in the Cucumber monorepo instead: -https://github.com/cucumber/cucumber/issues diff --git a/javascript/.github/PULL_REQUEST_TEMPLATE.md b/javascript/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 2c0c878d..00000000 --- a/javascript/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,5 +0,0 @@ -PLEASE DO NOT CREATE PULL REAUESTS IN THIS REPO. -THIS REPO IS A READ-ONLY MIRROR. - -Create your pull request in the Cucumber monorepo instead: -https://github.com/cucumber/cucumber/pulls diff --git a/javascript/.rsync b/javascript/.rsync deleted file mode 100644 index 2672e9f3..00000000 --- a/javascript/.rsync +++ /dev/null @@ -1,3 +0,0 @@ -../../LICENSE LICENSE -../../.templates/github/ .github/ -../../.templates/javascript/ . diff --git a/javascript/Makefile b/javascript/Makefile deleted file mode 100644 index 432630b3..00000000 --- a/javascript/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -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/default.mk b/javascript/default.mk deleted file mode 100644 index b04d59c4..00000000 --- a/javascript/default.mk +++ /dev/null @@ -1,87 +0,0 @@ -SHELL := /usr/bin/env bash -# 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: .tested -.PHONY: default - -../../node_modules ../../package-lock.json: package.json - cd ../.. && npm install - -.codegen: - touch $@ - -.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 $@ - -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-version: -ifeq ($(IS_TESTDATA),-testdata) - # no-op -else -ifdef 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)" -else - @echo -e "\033[0;31mNEW_VERSION is not defined. Can't update version :-(\033[0m" - exit 1 -endif -endif -.PHONY: update-version - -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 - -post-release: -.PHONY: post-release - -clean: clean-javascript -.PHONY: clean - -clean-javascript: - rm -rf .deps .codegen .tested* coverage dist acceptance -.PHONY: clean-javascript - -clobber: clean - rm -rf node_modules ../../node_modules -.PHONY: clobber - -### COMMON stuff for all platforms - -BERP_VERSION = 1.3.0 -BERP_GRAMMAR = gherkin.berp - -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/package.json b/package.json similarity index 100% rename from javascript/package.json rename to package.json diff --git a/javascript/scripts/fake-cucumber.sh b/scripts/fake-cucumber.sh similarity index 100% rename from javascript/scripts/fake-cucumber.sh rename to scripts/fake-cucumber.sh diff --git a/javascript/src/DataTable.ts b/src/DataTable.ts similarity index 100% rename from javascript/src/DataTable.ts rename to src/DataTable.ts diff --git a/javascript/src/DateClock.ts b/src/DateClock.ts similarity index 100% rename from javascript/src/DateClock.ts rename to src/DateClock.ts diff --git a/javascript/src/EmptyPickleTestStep.ts b/src/EmptyPickleTestStep.ts similarity index 100% rename from javascript/src/EmptyPickleTestStep.ts rename to src/EmptyPickleTestStep.ts diff --git a/javascript/src/ErrorMessageGenerator.ts b/src/ErrorMessageGenerator.ts similarity index 100% rename from javascript/src/ErrorMessageGenerator.ts rename to src/ErrorMessageGenerator.ts diff --git a/javascript/src/ExpressionStepDefinition.ts b/src/ExpressionStepDefinition.ts similarity index 100% rename from javascript/src/ExpressionStepDefinition.ts rename to src/ExpressionStepDefinition.ts diff --git a/javascript/src/GherkinQueryStream.ts b/src/GherkinQueryStream.ts similarity index 100% rename from javascript/src/GherkinQueryStream.ts rename to src/GherkinQueryStream.ts diff --git a/javascript/src/Hook.ts b/src/Hook.ts similarity index 100% rename from javascript/src/Hook.ts rename to src/Hook.ts diff --git a/javascript/src/HookTestStep.ts b/src/HookTestStep.ts similarity index 100% rename from javascript/src/HookTestStep.ts rename to src/HookTestStep.ts diff --git a/javascript/src/IClock.ts b/src/IClock.ts similarity index 100% rename from javascript/src/IClock.ts rename to src/IClock.ts diff --git a/javascript/src/IParameterTypeDefinition.ts b/src/IParameterTypeDefinition.ts similarity index 100% rename from javascript/src/IParameterTypeDefinition.ts rename to src/IParameterTypeDefinition.ts diff --git a/javascript/src/IStopwatch.ts b/src/IStopwatch.ts similarity index 100% rename from javascript/src/IStopwatch.ts rename to src/IStopwatch.ts diff --git a/javascript/src/IncrementClock.ts b/src/IncrementClock.ts similarity index 100% rename from javascript/src/IncrementClock.ts rename to src/IncrementClock.ts diff --git a/javascript/src/IncrementStopwatch.ts b/src/IncrementStopwatch.ts similarity index 100% rename from javascript/src/IncrementStopwatch.ts rename to src/IncrementStopwatch.ts diff --git a/javascript/src/PerfHooksStopwatch.ts b/src/PerfHooksStopwatch.ts similarity index 100% rename from javascript/src/PerfHooksStopwatch.ts rename to src/PerfHooksStopwatch.ts diff --git a/javascript/src/PickleTestStep.ts b/src/PickleTestStep.ts similarity index 100% rename from javascript/src/PickleTestStep.ts rename to src/PickleTestStep.ts diff --git a/javascript/src/SupportCode.ts b/src/SupportCode.ts similarity index 100% rename from javascript/src/SupportCode.ts rename to src/SupportCode.ts diff --git a/javascript/src/SupportCodeExecutor.ts b/src/SupportCodeExecutor.ts similarity index 100% rename from javascript/src/SupportCodeExecutor.ts rename to src/SupportCodeExecutor.ts diff --git a/javascript/src/TestCase.ts b/src/TestCase.ts similarity index 100% rename from javascript/src/TestCase.ts rename to src/TestCase.ts diff --git a/javascript/src/TestPlan.ts b/src/TestPlan.ts similarity index 100% rename from javascript/src/TestPlan.ts rename to src/TestPlan.ts diff --git a/javascript/src/TestStep.ts b/src/TestStep.ts similarity index 100% rename from javascript/src/TestStep.ts rename to src/TestStep.ts diff --git a/javascript/src/cli.ts b/src/cli.ts similarity index 100% rename from javascript/src/cli.ts rename to src/cli.ts diff --git a/javascript/src/dsl.ts b/src/dsl.ts similarity index 100% rename from javascript/src/dsl.ts rename to src/dsl.ts diff --git a/javascript/src/findSupportCodePaths.ts b/src/findSupportCodePaths.ts similarity index 100% rename from javascript/src/findSupportCodePaths.ts rename to src/findSupportCodePaths.ts diff --git a/javascript/src/global.ts b/src/global.ts similarity index 100% rename from javascript/src/global.ts rename to src/global.ts diff --git a/javascript/src/index.ts b/src/index.ts similarity index 100% rename from javascript/src/index.ts rename to src/index.ts diff --git a/javascript/src/loadSupportCode.ts b/src/loadSupportCode.ts similarity index 100% rename from javascript/src/loadSupportCode.ts rename to src/loadSupportCode.ts diff --git a/javascript/src/makeAttach.ts b/src/makeAttach.ts similarity index 100% rename from javascript/src/makeAttach.ts rename to src/makeAttach.ts diff --git a/javascript/src/makeHookTestStep.ts b/src/makeHookTestStep.ts similarity index 100% rename from javascript/src/makeHookTestStep.ts rename to src/makeHookTestStep.ts diff --git a/javascript/src/makePickleTestStep.ts b/src/makePickleTestStep.ts similarity index 100% rename from javascript/src/makePickleTestStep.ts rename to src/makePickleTestStep.ts diff --git a/javascript/src/makeTestCase.ts b/src/makeTestCase.ts similarity index 100% rename from javascript/src/makeTestCase.ts rename to src/makeTestCase.ts diff --git a/javascript/src/makeTestPlan.ts b/src/makeTestPlan.ts similarity index 100% rename from javascript/src/makeTestPlan.ts rename to src/makeTestPlan.ts diff --git a/javascript/src/runCucumber.ts b/src/runCucumber.ts similarity index 100% rename from javascript/src/runCucumber.ts rename to src/runCucumber.ts diff --git a/javascript/src/types.ts b/src/types.ts similarity index 100% rename from javascript/src/types.ts rename to src/types.ts diff --git a/javascript/test/DataTableTest.ts b/test/DataTableTest.ts similarity index 100% rename from javascript/test/DataTableTest.ts rename to test/DataTableTest.ts diff --git a/javascript/test/HookTest.ts b/test/HookTest.ts similarity index 100% rename from javascript/test/HookTest.ts rename to test/HookTest.ts diff --git a/javascript/test/StepDefinitionTest.ts b/test/StepDefinitionTest.ts similarity index 100% rename from javascript/test/StepDefinitionTest.ts rename to test/StepDefinitionTest.ts diff --git a/javascript/test/SupportCodeExecutorTest.ts b/test/SupportCodeExecutorTest.ts similarity index 100% rename from javascript/test/SupportCodeExecutorTest.ts rename to test/SupportCodeExecutorTest.ts diff --git a/javascript/test/SupportCodeTest.ts b/test/SupportCodeTest.ts similarity index 100% rename from javascript/test/SupportCodeTest.ts rename to test/SupportCodeTest.ts diff --git a/javascript/test/TestCaseTest.ts b/test/TestCaseTest.ts similarity index 100% rename from javascript/test/TestCaseTest.ts rename to test/TestCaseTest.ts diff --git a/javascript/test/TestHelpers.ts b/test/TestHelpers.ts similarity index 100% rename from javascript/test/TestHelpers.ts rename to test/TestHelpers.ts diff --git a/javascript/test/TestPlanTest.ts b/test/TestPlanTest.ts similarity index 100% rename from javascript/test/TestPlanTest.ts rename to test/TestPlanTest.ts diff --git a/javascript/test/TestStepTest.ts b/test/TestStepTest.ts similarity index 100% rename from javascript/test/TestStepTest.ts rename to test/TestStepTest.ts diff --git a/javascript/test/TestWorld.ts b/test/TestWorld.ts similarity index 100% rename from javascript/test/TestWorld.ts rename to test/TestWorld.ts diff --git a/javascript/test/attachTest.ts b/test/attachTest.ts similarity index 100% rename from javascript/test/attachTest.ts rename to test/attachTest.ts diff --git a/javascript/test/cucumber.png b/test/cucumber.png similarity index 100% rename from javascript/test/cucumber.png rename to test/cucumber.png diff --git a/javascript/test/findSupportCodePathsTest.ts b/test/findSupportCodePathsTest.ts similarity index 100% rename from javascript/test/findSupportCodePathsTest.ts rename to test/findSupportCodePathsTest.ts diff --git a/javascript/test/makeTestCaseTest.ts b/test/makeTestCaseTest.ts similarity index 100% rename from javascript/test/makeTestCaseTest.ts rename to test/makeTestCaseTest.ts diff --git a/javascript/test/support/nested/js.js b/test/support/nested/js.js similarity index 100% rename from javascript/test/support/nested/js.js rename to test/support/nested/js.js diff --git a/javascript/test/support/nested/ts.ts b/test/support/nested/ts.ts similarity index 100% rename from javascript/test/support/nested/ts.ts rename to test/support/nested/ts.ts diff --git a/javascript/test/support/test.feature b/test/support/test.feature similarity index 100% rename from javascript/test/support/test.feature rename to test/support/test.feature diff --git a/javascript/tsconfig.build.json b/tsconfig.build.json similarity index 100% rename from javascript/tsconfig.build.json rename to tsconfig.build.json diff --git a/javascript/tsconfig.json b/tsconfig.json similarity index 100% rename from javascript/tsconfig.json rename to tsconfig.json