Cleanup

.gitignore

@@ -1,13 +1,2 @@
-.npm
-.eslintcache
-.idea/
-.aws-sam/
-packaged.yaml
 node_modules/
-coverage/
-.nyc_output/
-dist/
-
-.aws-secrets
-test-env.json
-samconfig.toml
+dist/

features/step_definitions/steps.ts

@@ -1,10 +1,9 @@
 import { Given, When, Then } from '@cucumber/cucumber'
-import { Actor } from '../../src'
+import { Actor, eventually } from '@cucumber/screenplay'
 
 import World from '../support/World'
-import { Message } from '../src/types'
+import { Message } from '../../src/types'
 import assert from 'assert'
-import eventually from '../../src/eventually'
 import getSession from '../support/helpers/getSession'
 
 Given('{actor} is online', async function (this: World, actor: Actor<World>) {

features/support/World.ts

@@ -1,17 +1,17 @@
 import { setWorldConstructor, Before, After, defineParameterType } from '@cucumber/cucumber'
 import { AppElements } from '@cucumber/electron'
-import { ActorWorld, ActorParameterType } from '../../src/index'
+import { ActorWorld, ActorParameterType } from '@cucumber/screenplay'
 
-import Shouty from '../src/Shouty'
-import { makeApp } from '../src/server'
+import Shouty from '../../src/Shouty'
+import { makeApp } from '../../src/server'
 import { promisify } from 'util'
 import { InboxMessages, Shout, StartSession } from './tasks/types'
 
 defineParameterType({ ...ActorParameterType })
 defineParameterType({
   name: 'coordinate',
   regexp: /\(\s*(\d+),\s*(\d+)\s*\)/,
-  transformer(x, y) {
+  transformer(x: string, y: string) {
     return { x: +x, y: +y }
   },
 })

features/support/helpers/getDomUser.tsx

@@ -1,8 +1,8 @@
 import { createRoot } from 'react-dom/client'
-import App from '../../src/components/App'
+import App from '../../../src/components/App'
 import React from 'react'
 import World from '../World'
-import { Actor } from '../../../src'
+import { Actor } from '@cucumber/screenplay'
 import getSession from './getSession'
 import userEvent from '@testing-library/user-event'
 // import { UserEvent } from '@testing-library/user-event/dist/types/setup/setup'

features/support/helpers/getInboxMessages.ts

@@ -1,6 +1,6 @@
-import { Actor } from '../../../src'
+import { Actor } from '@cucumber/screenplay'
 import World from '../World'
-import { Message } from '../../src/types'
+import { Message } from '../../../src/types'
 import getSession from './getSession'
 
 export default function getInboxMessages(actor: Actor<World>): readonly Message[] {

features/support/helpers/getSession.ts

@@ -1,7 +1,7 @@
-import { Actor } from '../../../src'
+import { Actor } from '@cucumber/screenplay'
 import World from '../World'
-import { Session } from '../../src/types'
-import HttpSession from '../../src/HttpSession'
+import { Session } from '../../../src/types'
+import HttpSession from '../../../src/HttpSession'
 import NodeEventSource from 'eventsource'
 
 export default function getSession(actor: Actor<World>): Session {

features/support/tasks/dom/inboxMessages.ts

@@ -1,4 +1,4 @@
-import { Actor } from '../../../../src'
+import { Actor } from '@cucumber/screenplay'
 import World from '../../World'
 import { InboxMessages } from '../types'
 import { microdata, toArray } from '@cucumber/microdata'

features/support/tasks/dom/interactions/clickShoutButton.ts

@@ -1,4 +1,4 @@
-import { Actor, eventually } from '../../../../../src'
+import { Actor, eventually } from '@cucumber/screenplay'
 import World from '../../../World'
 import { getByText } from '@testing-library/dom'
 import { ClickShoutButton } from './types'

features/support/tasks/dom/interactions/typeMessage.ts

@@ -1,4 +1,4 @@
-import { Actor } from '../../../../../src'
+import { Actor } from '@cucumber/screenplay'
 import World from '../../../World'
 import { getByLabelText } from '@testing-library/dom'
 import userEvent from '@testing-library/user-event'

features/support/tasks/dom/interactions/types.ts

@@ -1,5 +1,5 @@
-import { Action, PromiseAction } from '../../../../../src'
-import { Message } from '../../../../src/types'
+import { Action, PromiseAction } from '@cucumber/screenplay'
+import { Message } from '../../../../../src/types'
 
 export type ClickShoutButton = () => PromiseAction
 export type TypeMessage = (message: Message) => Action

features/support/tasks/dom/shout.ts

@@ -1,4 +1,4 @@
-import { Actor } from '../../../../src'
+import { Actor } from '@cucumber/screenplay'
 import World from '../../World'
 import { Shout } from '../types'
 import { typeMessage } from './interactions/typeMessage'

features/support/tasks/dom/startSession.tsx

@@ -1,4 +1,4 @@
-import { Actor, eventually } from '../../../../src'
+import { Actor, eventually } from '@cucumber/screenplay'
 import World from '../../World'
 import { StartSession } from '../types'
 import getDomUser from '../../helpers/getDomUser'

features/support/tasks/session/inboxMessages.ts

@@ -1,4 +1,4 @@
-import { Actor } from '../../../../src'
+import { Actor } from '@cucumber/screenplay'
 import { InboxMessages } from '../types'
 import World from '../../World'
 import getInboxMessages from '../../helpers/getInboxMessages'

features/support/tasks/session/shout.ts

@@ -1,7 +1,7 @@
-import { Actor } from '../../../../src'
+import { Actor } from '@cucumber/screenplay'
 import World from '../../World'
 import { Shout } from '../types'
-import { Message } from '../../../src/types'
+import { Message } from '../../../../src/types'
 import getSession from '../../helpers/getSession'
 
 export const shout: Shout = (message: Message) => {

features/support/tasks/session/startSession.ts

@@ -1,4 +1,4 @@
-import { Actor } from '../../../../src'
+import { Actor } from '@cucumber/screenplay'
 import World from '../../World'
 import { StartSession } from '../types'
 import getSession from '../../helpers/getSession'

features/support/tasks/types.ts

@@ -1,5 +1,5 @@
-import { Action, PromiseAction } from '../../../src'
-import { Message } from '../../src/types'
+import { Action, PromiseAction } from '@cucumber/screenplay'
+import { Message } from '../../../src/types'
 
 export type StartSession = () => PromiseAction
 export type Shout = (message: Message) => PromiseAction