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

[next] chore(master): merge master into next #4947

Merged
merged 131 commits into from
Dec 18, 2023

Conversation

raimund-schluessler
Copy link
Contributor

☑️ Resolves

  • Merges master into next.

Antreesy and others added 30 commits November 23, 2023 09:20
Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>
100% translated source file: 'l10n/messages.pot'
on 'uk'.
…pill-form

feat(NcInputField): add optional pill form appearance to the component
…9836fb49eeb7494eb2c87d1dac

Updates for project Nextcloud vue library
Otherwise it is not actually positioned on the label and moved away in scrollable container.
It also may scroll the container on click.

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
…switch--hidden-input-position

fix(NcCheckboxRadioSwitch): visually hidden input position
… button order

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
fix(NcDialog): Add slighly more padding on the bottom and fix example button order
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
…on-docs

docs(NcAppNavigation): Add docs for slots and remove private components from styleguide
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
…on--remove-v-tooltip

fix(NcAppNavigation): replace custom `v-tooltip` with native `title`
`aria-label` should be set directly on the element being labelled.

Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
…caption-color

fix(NcAppNavigationCaption): Make color `main-text` for accessibility
Signed-off-by: GitHub <noreply@github.com>
…--correct-aria-label

fix(NcColorPicker): correct aria-label
100% translated source file: 'l10n/messages.pot'
on 'it'.
…er-styling-update

Automated styling update from server
…9836fb49eeb7494eb2c87d1dac

Updates for project Nextcloud vue library
…o-in-aria-haspopup

fix(NcActions): typo in aria-haspopup
chore(lint): use valid JSDoc for literal type union
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
fix(NcDialog): Increase specificity for modal-content selector
…the color picker

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
…ebar--remove-debug-log

refactor(NcAppSidebar): remove unneeded debug log
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
…ide-aria-expanded-false

fix(NcActions): provide `aria-expanded="false"` when menu is closed instead of removing it
Most API returns relative icon URLs so we should also support them for NcActionXXX

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
…dth 100% and padding

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux
Copy link
Contributor

susnux commented Dec 13, 2023

@susnux Do you have an idea why cypress complains about typescript here?

No idea why this is caused by this changes but this means somehow ts-node is not called correctly. Or better: There is a mixup of ESM and CJS.
I guess because our package.json implicitly states commonjs but the configuration file is ESM, thus for ts-node it should be called .mts but cypress does not support this extension.

So there are two options:

  1. Move configuration to .mjs
  2. Make the package ESM by default (add type: "module" to the package.json).

For the next version / the next branch I would prefer the second solution, but when applied on current master then the first one so it is not a breaking change.

@ShGKme
Copy link
Contributor

ShGKme commented Dec 13, 2023

For the next version / the next branch I would prefer the second solution, but when applied on current master then the first one so it is not a breaking change.

What may break the second one?

@raimund-schluessler
Copy link
Contributor Author

I would propose to fix and merge #4930 first. Then it will work here as well.

@susnux
Copy link
Contributor

susnux commented Dec 13, 2023

What may break the second one?

I can not think of any but it changes the the package type thus I thought it might be considered breaking.

@susnux susnux mentioned this pull request Dec 13, 2023
2 tasks
Pytal and others added 12 commits December 14, 2023 12:22
fix(NcListItem): Ensure list item does not overflow wrapper
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
…icon-url

fix(NcActionX): Allow relative icon URL
…ngsDialog--respect-show-navigation-prop

fix(NcAppSettingsDialog): respect showNavigation prop
Signed-off-by: Eduardo Morales <emoral435@gmail.com>
fix(NcAppNavigation): Bring back hover state for active element
…lear-ARIA-CHANGE

enh(aria): changed check color to adhere to 3:1 ratio
Signed-off-by: Grigorii K. Shartsev <me@shgk.me>
Signed-off-by: Mostafa Ahangarha <ahangarha@riseup.net>
@raimund-schluessler
Copy link
Contributor Author

I recreated the PR without the problematic update to typescript@5.3.3 (which isn't merged into master yet anyway) and pulled in all latest changes from master. I think it should be good to merge now.

@raimund-schluessler raimund-schluessler merged commit 13b5811 into next Dec 18, 2023
15 checks passed
@raimund-schluessler raimund-schluessler deleted the chore/noid/merge-master-next branch December 18, 2023 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Waiting for reviews vue 3 Related to the vue 3 migration
Projects
None yet
Development

Successfully merging this pull request may close these issues.