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 changes from upstream #59

Merged
merged 169 commits into from
Dec 17, 2024
Merged

Merge changes from upstream #59

merged 169 commits into from
Dec 17, 2024

Conversation

mdaniels5757
Copy link
Owner

No description provided.

NovemLinguae and others added 30 commits March 23, 2023 09:24
* docs: mention git branches, GitHub forks, manual testing

* space

* remove advice about squashing and merging. not needed imo

* mention "fixes 123" trick for closing GitHub issues
…#1766)

Bumps [eslint](https://github.com/eslint/eslint) from 8.33.0 to 8.37.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.33.0...v8.37.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update friendlywelcome.js

Add welcome-copyright to the welcome module

* Update friendlywelcome.js

add comma

* fix template parameters

---------

Co-authored-by: NovemLinguae <[email protected]>
…#1772)

Bumps [eslint](https://github.com/eslint/eslint) from 8.37.0 to 8.39.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](eslint/eslint@v8.37.0...v8.39.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* add uw-fringe1-4

* add commas

* fix lint

* Update twinklewarn.js

del uw-fringe4

* Update twinklewarn.js

rm stray comma
- bump jest from v27 to v29
- bump mock-mediawiki to v1.4.0
- install jest-environment-jsdom, needed for jest v29 to work
- adjust snapshot test syntax a bit, to work with jest v29
* add dependency notes to DEVELOPER.md

* add jest-environment-jsdom
Now that we're finally on the latest version of Jest, it should be safe to update all our npm dependencies.

These are all **dev** dependencies and have no chance of breaking the Twinkle build used on-wiki.

Since these are all dev dependencies, the only testing needed should be 1) make sure CI passes and 2) make sure `npm start` works.

Tested, works.
I had to dig into this code to explore a bug, and I found it confusing. This renames some variables, and changes the wording of some things on the Wikipedia:Twinkle/Preferences screen. Should be no change in functionality.
- add comment
- capitalize a template name
- remove dead code (the template W-short does not support the parameter heading=true)

Related wikimedia-gadgets#1785
* tag: add namespace rules for redirect tags

* comment with stack overflow link

* change mainspaceOnly to not allow talk namespace

* rebase

* mention CC BY-SA 4.0

* merge conflict

* use string.endsWith()
…adgets#1637)

* sanitized-css: don't tick <noinclude> check box

* refactor based on code review suggestion

Co-authored-by: Siddharth VP <[email protected]>

* fix

* Morebits.pageNameNorm.startsWith

* Morebits.pageNameNorm.startsWith

* includes()

---------

Co-authored-by: Siddharth VP <[email protected]>
)

* Update friendlytag.js

added media and emoji redirect templates

* Update friendlytag.js

* fix front end code of flag checkbox. back end is still broken

* remove optional params from {{R from emoji}}

---------

Co-authored-by: NovemLinguae <[email protected]>
* Update twinkle.js

* Update friendlywelcome.js

* Update twinklearv.js

* Update twinklefluff.js

* Update twinklewarn.js

* Fix lint error

* Elaborate comment

* Optimize: only get/set prefills on demand

* Call prototype hasOwnProperty()

* Simplify

* comments

---------

Co-authored-by: NovemLinguae <[email protected]>
* Fix double punctuation issues at AIV

* fix double ternary

* refactor

---------

Co-authored-by: NovemLinguae <[email protected]>
…ia-gadgets#1784)

* add {{r from airport code}} and {{r from airline code}}

* restriction: insideMainspaceOnly

* errant spaces

---------

Co-authored-by: NovemLinguae <[email protected]>
)

* add {{WikiProject Women in Red invite}}

* readd, accidentally deleted?

* fix WP spelling, fix template name

* alphabetize

---------

Co-authored-by: NovemLinguae <[email protected]>
* alphabetized "Problem user welcome templates"

* Alphabetized "Problem user welcome templates"

* final commit
`npm start` tested, works. If CI passes, this should be safe to merge. Will likely resolve the 2 pending dependabot PRs.
mdaniels5757 and others added 11 commits December 10, 2024 14:47
* tests: turn on eslint

I had it off. I guess because it needs a different config (wikimedia/server). This patch sets that up.

Will run autofixes in the next patch. Should be able to get rid of a bunch of rule exceptions by running the autofixes.

* add rule exception
…includes (wikimedia-gadgets#2125)

* eslint: turn off es-x/no-array-prototype-includes

after discussion in wikimedia-gadgets#2101

* turn on unicorn/prefer-includes

* more autofixes

* fix linter error
* eslint: apply autofixes to tests

* alphabetical
manual fixes using F2 rename variable in VS Code
* eslint: fix `strict` in tests

manual fixes

* forgot a file

* remove comma
manual fixes

basically just hard-code all the existing globals into the "globals" section of .eslintrc.json
* eslint: fix no-useless-escape in tests

manual fixes

* comma
@github-actions github-actions bot removed dependencies Pull requests that update a dependency file Docs Module: diff Gadget labels Dec 14, 2024
@mdaniels5757 mdaniels5757 merged commit db73894 into master Dec 17, 2024
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.