Skip to content

Commit

Permalink
Merge pull request #8 from currents-dev/next
Browse files Browse the repository at this point in the history
Support cypress 11
  • Loading branch information
agoldis authored Nov 11, 2022
2 parents 3e2f03e + efb4769 commit 0ccb1da
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 31 deletions.
22 changes: 12 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
- Merge pull request #5 from codelab-app:main (bd4af5e)
- fix: forward configuration context to executor (b6b5e42)
- feat: use cy2@3.2.0, support cypress 11 (f1950ab)

* Merge pull request #2 from currents-dev/dependabot/npm_and_yarn/node-fetch-2.6.7 (88dda59)
* chore(deps): bump node-fetch from 2.6.6 to 2.6.7 (1c0a59c)
* Merge pull request #1 from currents-dev/dependabot/npm_and_yarn/minimist-1.2.6 (6aeb342)
* fix: remove conflicting options to avoid overrides (aa6ad79)
* chore(deps): bump minimist from 1.2.5 to 1.2.6 (726f96d)
* Merge pull request #5 from codelab-app:main (bd4af5e)
* fix: forward configuration context to executor (b6b5e42)

- chore: update README (1d07be2)
- Merge pull request #2 from currents-dev/dependabot/npm_and_yarn/node-fetch-2.6.7 (88dda59)
- chore(deps): bump node-fetch from 2.6.6 to 2.6.7 (1c0a59c)
- Merge pull request #1 from currents-dev/dependabot/npm_and_yarn/minimist-1.2.6 (6aeb342)
- fix: remove conflicting options to avoid overrides (aa6ad79)
- chore(deps): bump minimist from 1.2.5 to 1.2.6 (726f96d)

* fix: set correct executors path (e6a706d)
* fix: remove cy2 from dependencies (a6eade1)
* chore: update README (1d07be2)

- fix: set correct executors path (e6a706d)
- fix: remove cy2 from dependencies (a6eade1)

## 0.0.2 (2021-11-19)
44 changes: 26 additions & 18 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@currents/nx",
"version": "0.0.7",
"version": "0.1.0",
"description": "Currents plugin for Nx",
"author": "Andrew Goldis",
"homepage": "https://currents.dev",
Expand Down
6 changes: 4 additions & 2 deletions src/executors/currents.impl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ export default async function currentsExecutor(
options: CurrentsExecutorOptions,
context: ExecutorContext
) {
await patch(options.cypressApiUrl ?? 'https://cy.currents.dev');
process.env.CYPRESS_API_URL =
options.cypressApiUrl ?? 'https://cy.currents.dev';

await patch();

const result = await Promise.race([
await runExecutor(
Expand All @@ -27,6 +30,5 @@ export default async function currentsExecutor(
if (!res.success) return res;
}

await patch('https://api.cypress.io');
return { success: true };
}

0 comments on commit 0ccb1da

Please sign in to comment.