Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
bde5324
Add npm workspaces
aurelien-reeves Feb 19, 2021
7933a17
Fix indentation in package.json
aurelien-reeves Feb 19, 2021
e62fa70
Add tsconfig. Make 'npm run build' work from root dir
Feb 19, 2021
11e8213
Fix tsc compilation
Feb 19, 2021
acf0272
Add cucumber-expressions to the build
Feb 19, 2021
f05342a
Add tag-expressions
Feb 19, 2021
1b2b2c3
Add create-meta
Feb 19, 2021
31bad8d
Add fake-cucumber
Feb 19, 2021
ff8d46d
Add query
Feb 19, 2021
e8ae89d
Add compatibility-kit
Feb 19, 2021
ffe62fc
add prepare script to messages/javascript
davidjgoss Feb 19, 2021
8ddb68f
Add react
Feb 21, 2021
a19d509
Merge branch 'master' into npm-workspaces
aslakhellesoy Feb 21, 2021
b9af850
Fix `npm run build`
aurelien-reeves Feb 22, 2021
4fe2f65
Add package-lock.json
Feb 22, 2021
de366d3
Merge master
Feb 22, 2021
19940a1
Add tsconfig-paths. Makes it possible to run tests without needing to…
Feb 22, 2021
0580276
Add ability to run tests without transpiling first
Feb 22, 2021
8bba00c
Merge branch 'master' into npm-workspaces
aurelien-reeves Feb 23, 2021
87da159
Add `html-formatter`
aurelien-reeves Feb 22, 2021
4218a5c
Add json-to-messages
aurelien-reeves Feb 22, 2021
befa487
Remove 'make' dependency in the 'npm clean' script
aurelien-reeves Feb 23, 2021
2fef3e5
Fix html-formatter test
aurelien-reeves Feb 23, 2021
dbac5b5
Better TypeScript
Feb 23, 2021
863abae
Fix json-to-messages
Feb 23, 2021
c3b3e5c
Move some tests from messages to message-streams
aurelien-reeves Feb 23, 2021
bfd92a2
Make query/javascript tests pass
aurelien-reeves Feb 23, 2021
e64381c
Fix more compilation errors
Feb 23, 2021
3815c0f
Make react/javascript tests pass
aurelien-reeves Feb 23, 2021
d5b97d8
Fix fake-cucumber exports
aurelien-reeves Feb 23, 2021
68d4094
Update everything to the last version
Feb 23, 2021
5d70468
eslint all code from the root
Feb 23, 2021
b3c2fb8
'npm run eslint-fix' passes
Feb 23, 2021
5699a6c
More eslint config
Feb 23, 2021
722c5d3
Tweak circle-ci settings
aurelien-reeves Feb 24, 2021
8cf5d90
Merge branch 'master' into npm-workspaces
aslakhellesoy Feb 24, 2021
af86b13
Fix circle-ci npm install job
aurelien-reeves Feb 24, 2021
45a2079
Fix typo
Feb 24, 2021
0c6fce1
Attach workspace from checkout
Feb 24, 2021
850efc2
Install npm@7 as part of the jobs
aurelien-reeves Feb 24, 2021
7758c83
Install npm@7 before testing all javascript modules
aurelien-reeves Feb 24, 2021
7179ea3
Remove some persistance in the CI
aurelien-reeves Feb 24, 2021
5d82cae
Hack to work around 'npm ci' not running the 'prepare' script in work…
Feb 24, 2021
349933f
Fix create-meta/javascript circle-ci job
aurelien-reeves Feb 25, 2021
562ea1d
Fix create-meta/javascript ci job
aurelien-reeves Feb 25, 2021
4500116
Add a 'npm-build' job in the CI
aurelien-reeves Feb 26, 2021
d390f3f
Update fake-cucumber and compatibility-kit CI jobs requiremenets
aurelien-reeves Feb 26, 2021
979fc7e
Fix fake-cucumber js makefile
aurelien-reeves Feb 26, 2021
e6d47bd
Move gherkin exe to gherkin-streams. It won't be exposed by the npm m…
Feb 26, 2021
f426d52
Move gherkin shim back to gherkin module. Restore the js main file fo…
Feb 26, 2021
1640348
Fix package-lock.json
aurelien-reeves Feb 26, 2021
8efbf52
Fix create-meta/javascript make
aurelien-reeves Feb 26, 2021
3ca7629
Add shim script for fake-cucumber
Feb 26, 2021
e801468
Remove unneded circle persistence
Feb 26, 2021
6d5789e
Persist less
Feb 27, 2021
bb35423
Fix path to .bin/build-storybook in react/js makefile
aurelien-reeves Mar 1, 2021
f1d5256
Merge branch 'master' into npm-workspaces
aslakhellesoy Mar 1, 2021
d022fef
Upgrade dependencies
Mar 1, 2021
38c496c
Use webpack 5
Mar 1, 2021
f18b084
Try to make the @cucumber/react build work
Mar 1, 2021
16c30ea
Change path to build-storybook
Mar 2, 2021
b9f6422
Do not persist what's causing concurrency problems
Mar 2, 2021
5588841
Change path to ts-node
Mar 2, 2021
ba252a5
Persist less
Mar 2, 2021
bb8e8a0
Do all the prep in prepare-parallel
Mar 2, 2021
314fcd5
Use different docker image
Mar 2, 2021
0e15a1b
Remove c21e
Mar 2, 2021
6de7fbd
Fix misc build errors
Mar 2, 2021
ed73bd2
Try to fix html-formatter build
Mar 3, 2021
4dd7eb3
Fix react/js ci job
aurelien-reeves Mar 3, 2021
57f0da8
Fix create-meta javascript ci job
aurelien-reeves Mar 3, 2021
4dbbcf4
Use cucumber-build docker image for html-formatter/js job
aurelien-reeves Mar 3, 2021
0a371b5
Install Headless Chrome dependencies in html-formatter-js ci job
aurelien-reeves Mar 3, 2021
35037fd
Persist html-formatter/javascript/dist to workspace
aurelien-reeves Mar 3, 2021
c39e057
Fix json-to-messages/javascript-testdata ci job
aurelien-reeves Mar 3, 2021
df3a4f8
Try to fix the serial build
aurelien-reeves Mar 3, 2021
9042956
Merge branch 'master' into npm-workspaces
aurelien-reeves Mar 4, 2021
0d7a581
Merge branch 'master' into npm-workspaces
aslakhellesoy Mar 8, 2021
acc2bf4
Add .rsync to gherkin-streams
aurelien-reeves Mar 9, 2021
d345e15
Add makefiles to gherkin-stream
aurelien-reeves Mar 9, 2021
ce4736c
Add a job for gherkin-streams/js in the CI
aurelien-reeves Mar 9, 2021
da95991
Start simplification of CircleCI Pipeline
aurelien-reeves Mar 9, 2021
7f4b72b
Launch puppeteer with no-sandbox
aurelien-reeves Mar 9, 2021
a98eafa
Add json-to-messages/javascript-testdata to workspaces
aurelien-reeves Mar 9, 2021
f360dab
Fix jsont-to-messages-javascript-testdata ci job
aurelien-reeves Mar 9, 2021
131b2b2
Use cucumber-js 6 with json-to-messages js testdata
aurelien-reeves Mar 10, 2021
11d917d
Merge remote-tracking branch 'origin/master' into npm-workspaces
aurelien-reeves Mar 10, 2021
a8e667e
Add makefiles to message-streams
aurelien-reeves Mar 10, 2021
e1d116e
Add a CircleCI job for message-streams
aurelien-reeves Mar 10, 2021
fefc905
Merge branch 'master' into npm-workspaces
aslakhellesoy Mar 10, 2021
fe96dd8
Make sure the serial build works locally with just 'make'
Mar 10, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
267 changes: 104 additions & 163 deletions .circleci/config.yml

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
messages/javascript/src/messages.js
messages/javascript/src/messages.d.ts
messages/javascript/dist/src/messages.js
messages/javascript/dist/src/messages.d.ts
gherkin/javascript/src/Parser.ts
File renamed without changes.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.DS_Store
.rsynced
.idea/
executables
executables
node_modules
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
File renamed without changes.
4 changes: 2 additions & 2 deletions .templates/javascript/.mocharc.json
Original file line number Diff line number Diff line change
@@ -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
}
16 changes: 0 additions & 16 deletions .templates/javascript/.nycrc.json

This file was deleted.

52 changes: 6 additions & 46 deletions .templates/javascript/default.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,53 +6,19 @@ PRIVATE = $(shell node -e "console.log(require('./package.json').private)")
NPM ?= npm
IS_TESTDATA = $(findstring -testdata,${CURDIR})

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
touch $@

$(LOCKFILE): package.json
$(NPM) install
.tested-npm: $(TYPESCRIPT_SOURCE_FILES)
$(NPM) run test
touch $@

update-dependencies:
npx npm-check-updates --upgrade
.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
pre-release: update-version update-dependencies clean default
.PHONY: pre-release

update-version:
Expand Down Expand Up @@ -81,17 +47,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
25 changes: 1 addition & 24 deletions .templates/javascript/tsconfig.json
Original file line number Diff line number Diff line change
@@ -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"
}
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
SHELL := /usr/bin/env bash
PACKAGES ?= c21e \
messages \
PACKAGES ?= messages \
gherkin \
gherkin-utils \
cucumber-expressions \
Expand All @@ -17,9 +16,14 @@ PACKAGES ?= c21e \
demo-formatter \
json-to-messages

default: .rsynced $(patsubst %,default-%,$(PACKAGES))
default: .rsynced .typescript-built $(patsubst %,default-%,$(PACKAGES))
.PHONY: default

.typescript-built:
npm ci
npm run build
.PHONY: .typescript-built

default-%: %
cd $< && make default

Expand Down
8 changes: 0 additions & 8 deletions RELEASE_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,6 @@ Make sure the package still builds, and that the tests are still passing:

make clean && make

** Special note for html-formatter **

We need to verify that the webpacked JavaScript runs in the browser.
Run the following on your host OS (it won't work in Docker):

make clean
CHECK_INTEGRITY=1 make

If all is good, proceed to the next step. Otherwise, make the necessary edits
until the build passes.

Expand Down
94 changes: 0 additions & 94 deletions c21e/CHANGELOG.md

This file was deleted.

9 changes: 0 additions & 9 deletions c21e/README.md

This file was deleted.

5 changes: 0 additions & 5 deletions c21e/java/.github/ISSUE_TEMPLATE.md

This file was deleted.

5 changes: 0 additions & 5 deletions c21e/java/.github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

16 changes: 0 additions & 16 deletions c21e/java/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions c21e/java/.rsync

This file was deleted.

1 change: 0 additions & 1 deletion c21e/java/.subrepo

This file was deleted.

21 changes: 0 additions & 21 deletions c21e/java/LICENSE

This file was deleted.

5 changes: 0 additions & 5 deletions c21e/java/README.md

This file was deleted.

Loading