Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge foretagsplatsen fork into core #112

Closed
wants to merge 110 commits into from

Conversation

jaffrepaul
Copy link
Member

@jaffrepaul jaffrepaul commented Sep 27, 2022

Merging maintained fork back into the core repo to be officially maintained internally.

For context, see this issue: #100

DamienCassou and others added 30 commits June 27, 2022 13:14
I will quickly switch to GitHub Actions.
NPM seems to be used everywhere else.
I don't want to support old versions of eslint. Let's stick to the 2
latest major releases for now.
It seems @cypress's eslint global configuration is not up-to-date with
eslint so I'm getting rid of it. Instead, I'm copy/pasting their rules
in the .eslintrc.cjs file.
Bumps [globals](https://github.com/sindresorhus/globals) from 11.12.0 to 13.15.0.
- [Release notes](https://github.com/sindresorhus/globals/releases)
- [Commits](sindresorhus/globals@v11.12.0...v13.15.0)

---
updated-dependencies:
- dependency-name: globals
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
…obals-13.15.0

chore(deps): bump globals from 11.12.0 to 13.15.0
Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 15.13.18 to 19.0.3.
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](semantic-release/semantic-release@v15.13.18...v19.0.3)

---
updated-dependencies:
- dependency-name: semantic-release
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [jest](https://github.com/facebook/jest/tree/HEAD/packages/jest) from 24.8.0 to 28.1.1.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v28.1.1/packages/jest)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
.eslintrc.json Outdated
@@ -1,8 +0,0 @@
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's stick with this config so it's consistent with other cypress repos and will fit in better once this repo is moved to the monorepo.

@@ -0,0 +1,23 @@
name: Test
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's stick with Circle for CI tests, since it's already set up for it and will integrate better into the monorepo.

README.md Outdated
@@ -1,4 +1,4 @@
# Cypress ESLint Plugin [![CircleCI](https://circleci.com/gh/cypress-io/eslint-plugin-cypress/tree/master.svg?style=svg)](https://circleci.com/gh/cypress-io/eslint-plugin-cypress/tree/master)
# Cypress ESLint Plugin [![Test](https://github.com/cypress-io/eslint-plugin-cypress/actions/workflows/test.yml/badge.svg)](https://github.com/cypress-io/eslint-plugin-cypress/actions/workflows/test.yml)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should stay pointing to Circle.

package.json Outdated
"peerDependencies": {
"eslint": ">= 3.2.1"
"eslint": ">= 7.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change makes this a breaking change, since users will have to upgrade their eslint to use it. To ensure this triggers a breaking change, it needs have a commit that follows the semantic release format, which is a bit different than triggering a patch or minor release.

@jaffrepaul jaffrepaul force-pushed the merge-foretagsplatsen-into-core branch 4 times, most recently from b53d775 to 0092ed9 Compare October 4, 2022 20:32
@jaffrepaul jaffrepaul force-pushed the merge-foretagsplatsen-into-core branch from 0092ed9 to 6746e22 Compare October 4, 2022 20:46
@jaffrepaul jaffrepaul force-pushed the merge-foretagsplatsen-into-core branch 2 times, most recently from 0ef177c to cd74e7f Compare October 4, 2022 21:04
@jaffrepaul jaffrepaul force-pushed the merge-foretagsplatsen-into-core branch from cd74e7f to 5bd19fa Compare October 4, 2022 21:21
@jaffrepaul jaffrepaul force-pushed the merge-foretagsplatsen-into-core branch from 0a3acdd to c680ef3 Compare October 5, 2022 21:47
@jaffrepaul jaffrepaul marked this pull request as draft October 5, 2022 21:52
@jaffrepaul jaffrepaul force-pushed the merge-foretagsplatsen-into-core branch from e632ad5 to f2c7b41 Compare October 12, 2022 18:30
@DamienCassou
Copy link

Any news about this?

@jaffrepaul
Copy link
Member Author

@DamienCassou Yes! this is part of a much larger and multi-step change to the core Cypress repo. Some steps have been taken towards the ultimate goal of combining and simplifying linting and this plugin's behavior. Thanks for your patience and contribution!

Merged:

Still to come:

@DamienCassou
Copy link

Any news about this?

@jaffrepaul
Copy link
Member Author

Thank you for following up contribution @DamienCassou!

Right now we don’t have the time available to put into reviewing and evaluating the changes proposed within the core Cypress repo but we'll keep this open for when more bandwidth is available.

@CLAassistant
Copy link

CLAassistant commented Aug 30, 2023

CLA assistant check
All committers have signed the CLA.

@DamienCassou
Copy link

@jennifer-shehane: is the work finished? Is the Cypress team giving up?

@jennifer-shehane
Copy link
Member

@DamienCassou We don't have time to dedicate to this merge atm. Especially with it not being in a finished state.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Move to Core Cypress repo
5 participants