rebase ionos_dev on v30.0.5

[printminion-co]

Summary

Review and merge dependencies

• change submodule pointer for apps-external
  • serverinfo (only submodule hash change is requied) https://github.com/nextcloud/serverinfo/releases/tag/v30.0.5
  • [~] user_oidc (no changes required)
  • viewer rebase ionos-dev onto v30.0.5 nc-viewer#19
• rebase custom-npms submodules
  • [~] nc-mdi-svg (current ^7.4.47) (NC ^7.4.47)
  • [~] nc-mdi-js (current ^7.4.47) (NC ^7.4.47)
  • [~] nc-mdi-util
  • ~~rebase ionos-dev onto v5.3.1 nc-vue-material-design-icons#6 (current 3.2.0) (NC ^5.3.1) ~~
  • Release v5.3.1 nc-vue-material-design-icons#7
  • rebase current ionos-dev onto v8.22.0 nc-nextcloud-vue#2

TODO

• review and merge dependencies
• update submodule pointers of

• serverinfo
• viewer
• nc-vue-material-design-icons
• nc-nextcloud-vue
• check for legacy template changes (since we just copied thee files)

rebase log

git fetch --all --tags

git checkout stable30
git reset --hard ionos/stable30

checkout tag as branch

git checkout tags/v30.0.5 -b nextcloud-v30.0.5

checkout ionos-dev

git switch ionos-dev
git reset --hard ionos/ionos-dev

create branch for rebase

git checkout -b ionos/rebase/ionos-dev-v30.0.5
git push origin ionos/rebase/ionos-dev-v30.0.5

rebase onto nextcloud-v30.0.5

• 65648889 is the hash of the last commit before our changes

git rebase --onto nextcloud-v30.0.5 65648889

resolve conflicts

• REBASE 46/155
  • IONOS: feat(files_sharing): confirm share deletion
    • ShareMixin.js -resolve conflicts
    • git rebase --continue
• REBASE 82/155
  • IONOS(nc-vue-icons): add nc-vue-material-design-icons as submodule
    • package-lock.json git restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.json
    • git rebase --continue
• REBASE 105/155
  • IONOS(nc-mdi-svg): add nc-MaterialDesign-SVG as submodule
    • package-lock.json
      • copy .npmrc from nc-mdi-svg
      • git restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.json
      • git rebase --continue
• REBASE 107/155
  • IONOS(nc-mdi-svg): use custom nc-MaterialDesign-SVG dist
    • package-lock.json
      • git restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.json
      • git rebase --continue
• REBASE 109/155
  • IONOS(build): switch to custom mdi icons
  • package-lock.json
    • git restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.json
    • git rebase --continue
• REBASE 116/155
  • IONOS(build): switch to custom nextcloud vue
    • package.json - resolve conflict
    • package-lock.json
      • git restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.json
      • git rebase --continue
• REBASE 117/155
  • IONOS(build): remove original "@mdi/js", "@mdi/svg", vue-material-design-icons" dependencies
    • package.json - resolve conflict
    • package-lock.json
      • git restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.json
      • git rebase --continue

Notes

• package-lock.json - should not contain "@fortawesome/*"

[bromiesTM]

there also is a issue with styling of mimetype icons and the filename